diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-06-15 10:14:31 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-06-16 07:07:35 -0400 |
commit | f1df5aec68946e427eb4884c4d80e3259361478c (patch) | |
tree | 2eaceaff08f06b598a163a122a3aaa41fbb3f9f7 /sound/soc/soc-core.c | |
parent | e71fa370428aa80e3acc3a49f8df1e76e7719347 (diff) |
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.c | 6 |
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, | |||
2433 | if (oval != val) { | 2433 | if (oval != val) { |
2434 | ret = snd_soc_write(codec, mc->reg, val); | 2434 | ret = snd_soc_write(codec, mc->reg, val); |
2435 | if (ret < 0) | 2435 | if (ret < 0) |
2436 | return 0; | 2436 | return ret; |
2437 | ret = 1; | ||
2438 | } | 2437 | } |
2439 | if (ovalr != valr) { | 2438 | if (ovalr != valr) { |
2440 | ret = snd_soc_write(codec, mc->rreg, valr); | 2439 | ret = snd_soc_write(codec, mc->rreg, valr); |
2441 | if (ret < 0) | 2440 | if (ret < 0) |
2442 | return 0; | 2441 | return ret; |
2443 | ret = 1; | ||
2444 | } | 2442 | } |
2445 | 2443 | ||
2446 | return 0; | 2444 | return 0; |