Unverified Commit 4061fdc8 authored Jan 14, 2020 by Charles Keepax Committed by Mark Brown Jan 17, 2020

ASoC: madera: Correct error path handling in madera_out1_demux_put



Should the write to MADERA_OUTPUT_ENABLES_1 fail and out_clamp[0] not be
set an additional error message will be printed. Clear the ret variable
to avoid this.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20200114161841.451-3-ckeepax@opensource.cirrus.com


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

parent df4e3eee

sound/soc/codecs/madera.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -575,6 +575,7 @@ int madera_out1_demux_put(struct snd_kcontrol *kcontrol,
		usleep_range(2000, 3000); /* wait for wseq to complete */

		/* change demux setting */
		ret = 0;
		if (madera->out_clamp[0])
		ret = regmap_update_bits(madera->regmap,
		MADERA_OUTPUT_ENABLES_1,

Admin message