Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[deliverable/linux.git] / drivers / isdn / mISDN / dsp_pipeline.c

diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c
index 18cf87c113e725cb9f7adc157963bb0105e3d5ea..e9941678edfa52ff51baa83b75a8d659017926b9 100644 (file)
--- a/drivers/isdn/mISDN/dsp_pipeline.c
+++ b/drivers/isdn/mISDN/dsp_pipeline.c
@@ -55,20 +55,19 @@ static ssize_t
 attr_show_args(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct mISDN_dsp_element *elem = dev_get_drvdata(dev);
-       ssize_t len = 0;
-       int i = 0;
+       int i;
+       char *p = buf;
 
        *buf = 0;
-       for (; i < elem->num_args; ++i)
-               len = sprintf(buf, "%sName:        %s\n%s%s%sDescription: %s\n"
-                       "\n", buf,
+       for (i = 0; i < elem->num_args; i++)
+               p += sprintf(p, "Name:        %s\n%s%s%sDescription: %s\n\n",
                          elem->args[i].name,
                          elem->args[i].def ? "Default:     " : "",
                          elem->args[i].def ? elem->args[i].def : "",
                          elem->args[i].def ? "\n" : "",
                          elem->args[i].desc);
 
-       return len;
+       return p - buf;
 }
 
 static struct device_attribute element_attributes[] = {
@@ -347,7 +346,8 @@ void dsp_pipeline_process_tx(struct dsp_pipeline *pipeline, u8 *data, int len)
                        entry->elem->process_tx(entry->p, data, len);
 }
 
-void dsp_pipeline_process_rx(struct dsp_pipeline *pipeline, u8 *data, int len)
+void dsp_pipeline_process_rx(struct dsp_pipeline *pipeline, u8 *data, int len,
+       unsigned int txlen)
 {
        struct dsp_pipeline_entry *entry;
 
@@ -356,7 +356,7 @@ void dsp_pipeline_process_rx(struct dsp_pipeline *pipeline, u8 *data, int len)
 
        list_for_each_entry_reverse(entry, &pipeline->list, list)
                if (entry->elem->process_rx)
-                       entry->elem->process_rx(entry->p, data, len);
+                       entry->elem->process_rx(entry->p, data, len, txlen);
 }