diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-11 13:00:28 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-11 13:00:28 -0400 |
| commit | cbf9c5ae32655e6c075fee9b55a9d8be4e67684c (patch) | |
| tree | ba92ab66314ee80444f1856f7cc3c29c36424de1 | |
| parent | ee3aee6a3bd846a70588ff219142244d00a51582 (diff) | |
| parent | 0eaa6cca1f75e12e4f5ec62cbe887330fe3b5fe9 (diff) | |
Merge remote-tracking branch 'asoc/fix/core' into tmp
| -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, | |||
| 2963 | val = val << shift; | 2963 | val = val << shift; |
| 2964 | 2964 | ||
| 2965 | ret = snd_soc_update_bits_locked(codec, reg, val_mask, val); | 2965 | ret = snd_soc_update_bits_locked(codec, reg, val_mask, val); |
| 2966 | if (ret != 0) | 2966 | if (ret < 0) |
| 2967 | return ret; | 2967 | return ret; |
| 2968 | 2968 | ||
| 2969 | if (snd_soc_volsw_is_stereo(mc)) { | 2969 | if (snd_soc_volsw_is_stereo(mc)) { |