Unverified Commit 4d6c2b46 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: dapm: Move stereo autodisable check 



Tidy up the code a little, rather than repeating the check of
mc->autodisable move the stereo error check to be under the
existing if for mc->autodisable.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220623105120.1981154-6-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d5017d13

sound/soc/soc-dapm.c

+5 −5
Original line number Diff line number Diff line
@@ -368,14 +368,14 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, 
	case snd_soc_dapm_mixer_named_ctl:

		mc = (struct soc_mixer_control *)kcontrol->private_value;



		if (mc->autodisable && snd_soc_volsw_is_stereo(mc))

		if (mc->autodisable) {

			struct snd_soc_dapm_widget template;



			if (snd_soc_volsw_is_stereo(mc))

				dev_warn(widget->dapm->dev,

					 "ASoC: Unsupported stereo autodisable control '%s'\n",

					 ctrl_name);



		if (mc->autodisable) {

			struct snd_soc_dapm_widget template;



			name = kasprintf(GFP_KERNEL, "%s %s", ctrl_name,

					 "Autodisable");

			if (!name) {