Commit 4061fdc8 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown

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: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20200114161841.451-3-ckeepax@opensource.cirrus.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent df4e3eee
...@@ -575,6 +575,7 @@ int madera_out1_demux_put(struct snd_kcontrol *kcontrol, ...@@ -575,6 +575,7 @@ int madera_out1_demux_put(struct snd_kcontrol *kcontrol,
usleep_range(2000, 3000); /* wait for wseq to complete */ usleep_range(2000, 3000); /* wait for wseq to complete */
/* change demux setting */ /* change demux setting */
ret = 0;
if (madera->out_clamp[0]) if (madera->out_clamp[0])
ret = regmap_update_bits(madera->regmap, ret = regmap_update_bits(madera->regmap,
MADERA_OUTPUT_ENABLES_1, MADERA_OUTPUT_ENABLES_1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment