Unverified Commit 1c12e032 authored Mar 21, 2023 by Peter Ujfalusi Committed by Mark Brown Mar 21, 2023

ASoC: SOF: ipc4-control: Return on error in sof_ipc4_widget_kcontrol_setup()

The patch adding the bytes control support moved the error check outside
of the list_for_each_entry() which was not correct as at the end of the
list_for_each_entry() the scontrol will no longer point where the error
happened, but it to the list head.

Restore the original logic and return on the first error with the error
code.

Fixes: a062c889 ("ASoC: SOF: ipc4-control: Add support for bytes control get and put")
Reported-by: Dan Carpenter <error27@gmail.com>
Link: https://lore.kernel.org/alsa-devel/6be945d2-40cb-46fb-67ba-ed3a19cddfa4@linux.intel.com/T/#t

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230321145651.9118-1-peter.ujfalusi@linux.intel.com

Signed-off-by: Mark Brown <broonie@kernel.org>

parent 1d78e193

sound/soc/sof/ipc4-control.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -429,15 +429,18 @@ static int sof_ipc4_widget_kcontrol_setup(struct snd_sof_dev *sdev, struct snd_s
		default:
		break;
		}
		}
		}

		if (ret < 0)
		dev_err(sdev->dev, "kcontrol %d set up failed for widget %s\n",
		if (ret < 0) {
		dev_err(sdev->dev,
		"kcontrol %d set up failed for widget %s\n",
		scontrol->comp_id, swidget->widget->name);

		return ret;
		}
		}
		}

		return 0;
		}

		static int
		sof_ipc4_set_up_volume_table(struct snd_sof_control *scontrol, int tlv[SOF_TLV_ITEMS], int size)