From: Charles Keepax Date: Tue, 14 Jan 2020 16:18:40 +0000 (+0000) Subject: ASoC: madera: Correct error path handling in madera_out1_demux_put X-Git-Tag: v5.6-rc1~42^2~3^2~65 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4061fdc89ff7704a71dc6df8e5841f861138e7e1;p=thirdparty%2Fkernel%2Flinux.git 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 Link: https://lore.kernel.org/r/20200114161841.451-3-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/madera.c b/sound/soc/codecs/madera.c index 12dc468ae6bf0..2be64422adf9b 100644 --- a/sound/soc/codecs/madera.c +++ b/sound/soc/codecs/madera.c @@ -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,