summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 12:56:44 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 12:56:44 (GMT)
commit75c3475daa8c4ca9000e1ea5e0263742bdab6755 (patch)
treeba92ab66314ee80444f1856f7cc3c29c36424de1 /sound
parent6ab7c227ba3e558634be6b4978c498b72e764443 (diff)
parent0eaa6cca1f75e12e4f5ec62cbe887330fe3b5fe9 (diff)
downloadlinux-fsl-qoriq-75c3475daa8c4ca9000e1ea5e0263742bdab6755.tar.xz
Merge remote-tracking branch 'asoc/fix/core' into asoc-next
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 507d251..ff4b45a5 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)) {