diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:56:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:56:44 +0100 |
| commit | 75c3475daa8c4ca9000e1ea5e0263742bdab6755 (patch) | |
| tree | ba92ab66314ee80444f1856f7cc3c29c36424de1 /sound | |
| parent | 6ab7c227ba3e558634be6b4978c498b72e764443 (diff) | |
| parent | 0eaa6cca1f75e12e4f5ec62cbe887330fe3b5fe9 (diff) | |
Merge remote-tracking branch 'asoc/fix/core' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 507d251916af..ff4b45a5d796 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)) { |