Merge remote-tracking branch 'asoc/fix/core' into tmp

cbf9c5ae · Mark Brown · ee3aee6a · 0eaa6cca · cbf9c5ae
Commit cbf9c5ae authored Apr 11, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/soc-core.c sound/soc/soc-core.c +1 -1

No files found.
--- 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)) {