aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-11 18:00:28 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-11 18:00:28 +0100
commitcbf9c5ae32655e6c075fee9b55a9d8be4e67684c (patch)
treeba92ab66314ee80444f1856f7cc3c29c36424de1 /sound
parentee3aee6a3bd846a70588ff219142244d00a51582 (diff)
parent0eaa6cca1f75e12e4f5ec62cbe887330fe3b5fe9 (diff)
downloadvexpress-lsk-cbf9c5ae32655e6c075fee9b55a9d8be4e67684c.tar.gz
Merge remote-tracking branch 'asoc/fix/core' into tmp
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 507d251916a..ff4b45a5d79 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2963,7 +2963,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
val = val << shift;
ret = snd_soc_update_bits_locked(codec, reg, val_mask, val);
- if (ret != 0)
+ if (ret < 0)
return ret;
if (snd_soc_volsw_is_stereo(mc)) {