ASoC: SOF: topology: fix get control data return type and arguments

sof_get_control_data returns negative values even though the return
value is defined unsigned (size_t). So change the return value type to
int and add the data size as pointer argument to sof_get_control_data to
avoid ambiquity in the meaning of the return type.

Fixes: cac974a51ebb ("ASoC: SOF: topology: use set_get_data in process load")
Reported by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
Link: https://lore.kernel.org/r/20190821211138.14618-1-jaska.uimonen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 28a7a6e06a539531333a758c07cc557cd3adfa9c..fc85efbad378c7308e4c410b5a9e6f6d3683c07b 100644 (file)
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -1752,17 +1752,19 @@ err:
        return ret;
 }
 
-static size_t sof_get_control_data(struct snd_sof_dev *sdev,
-                                  struct snd_soc_dapm_widget *widget,
-                                  struct sof_widget_data *wdata)
+static int sof_get_control_data(struct snd_sof_dev *sdev,
+                               struct snd_soc_dapm_widget *widget,
+                               struct sof_widget_data *wdata,
+                               size_t *size)
 {
        const struct snd_kcontrol_new *kc;
        struct soc_mixer_control *sm;
        struct soc_bytes_ext *sbe;
        struct soc_enum *se;
-       size_t size = 0;
        int i;
 
+       *size = 0;
+
        for (i = 0; i < widget->num_kcontrols; i++) {
                kc = &widget->kcontrol_news[i];
 
@@ -1800,7 +1802,7 @@ static size_t sof_get_control_data(struct snd_sof_dev *sdev,
                if (wdata[i].pdata->magic != SOF_ABI_MAGIC)
                        return -EINVAL;
 
-               size += wdata[i].pdata->size;
+               *size += wdata[i].pdata->size;
 
                /* get data type */
                switch (wdata[i].control->cmd) {
@@ -1819,7 +1821,7 @@ static size_t sof_get_control_data(struct snd_sof_dev *sdev,
                }
        }
 
-       return size;
+       return 0;
 }
 
 static int sof_process_load(struct snd_soc_component *scomp, int index,
@@ -1855,12 +1857,11 @@ static int sof_process_load(struct snd_soc_component *scomp, int index,
                        return -ENOMEM;
 
                /* get possible component controls and get size of all pdata */
-               ipc_data_size = sof_get_control_data(sdev, widget, wdata);
+               ret = sof_get_control_data(sdev, widget, wdata,
+                                          &ipc_data_size);
 
-               if (ipc_data_size <= 0) {
-                       ret = ipc_data_size;
+               if (ret < 0)
                        goto out;
-               }
        }
 
        ipc_size = sizeof(struct sof_ipc_comp_process) +