summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorMark Brown2010-06-15 16:14:31 +0200
committerMark Brown2010-06-16 13:07:35 +0200
commitf1df5aec68946e427eb4884c4d80e3259361478c (patch)
tree2eaceaff08f06b598a163a122a3aaa41fbb3f9f7 /sound/soc/soc-core.c
parentASoC: Default WM2000 ANC and speaker to enabled (diff)
downloadkernel-qcow2-linux-f1df5aec68946e427eb4884c4d80e3259361478c.tar.gz
kernel-qcow2-linux-f1df5aec68946e427eb4884c4d80e3259361478c.tar.xz
kernel-qcow2-linux-f1df5aec68946e427eb4884c4d80e3259361478c.zip
ASoC: Pay attention to write errors in volsw_2r_sx
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 254dd1c6914d..26f17323ef19 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2433,14 +2433,12 @@ int snd_soc_put_volsw_2r_sx(struct snd_kcontrol *kcontrol,
if (oval != val) {
ret = snd_soc_write(codec, mc->reg, val);
if (ret < 0)
- return 0;
- ret = 1;
+ return ret;
}
if (ovalr != valr) {
ret = snd_soc_write(codec, mc->rreg, valr);
if (ret < 0)
- return 0;
- ret = 1;
+ return ret;
}
return 0;