OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
df4e3ee
)
ASoC: madera: Correct error path handling in madera_out1_demux_put
author
Charles Keepax
<ckeepax@opensource.cirrus.com>
Tue, 14 Jan 2020 16:18:40 +0000
(16:18 +0000)
committer
Mark Brown
<broonie@kernel.org>
Fri, 17 Jan 2020 15:30:06 +0000
(15:30 +0000)
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>
sound/soc/codecs/madera.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/madera.c
b/sound/soc/codecs/madera.c
index
12dc468
..
2be6442
100644
(file)
--- 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,