ASoC: SOF: IPC3 topology: Print the conflicting bytes sizes

The error "Conflict in bytes vs. priv size." is too brief. With
the printed sizes it's a lot easier to find the size issue in
for binary control if such happens.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20221216115350.28260-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/ipc3-topology.c b/sound/soc/sof/ipc3-topology.c
index b94cc40485ed6d6e207f0cdec2e55bd944378654..989395999d6ec052656ee2202f94e8da760336d9 100644 (file)
--- a/sound/soc/sof/ipc3-topology.c
+++ b/sound/soc/sof/ipc3-topology.c
@@ -1651,6 +1651,7 @@ static int sof_ipc3_route_setup(struct snd_sof_dev *sdev, struct snd_sof_route *
 static int sof_ipc3_control_load_bytes(struct snd_sof_dev *sdev, struct snd_sof_control *scontrol)
 {
        struct sof_ipc_ctrl_data *cdata;
+       size_t priv_size_check;
        int ret;
 
        if (scontrol->max_size < (sizeof(*cdata) + sizeof(struct sof_abi_hdr))) {
@@ -1694,8 +1695,10 @@ static int sof_ipc3_control_load_bytes(struct snd_sof_dev *sdev, struct snd_sof_
                        goto err;
                }
 
-               if (cdata->data->size + sizeof(struct sof_abi_hdr) != scontrol->priv_size) {
-                       dev_err(sdev->dev, "Conflict in bytes vs. priv size.\n");
+               priv_size_check = cdata->data->size + sizeof(struct sof_abi_hdr);
+               if (priv_size_check != scontrol->priv_size) {
+                       dev_err(sdev->dev, "Conflict in bytes (%zu) vs. priv size (%zu).\n",
+                               priv_size_check, scontrol->priv_size);
                        ret = -EINVAL;
                        goto err;
                }