diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-31 21:07:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-31 21:07:23 +0100 |
| commit | 08d0a9757d5f6215a24b918a9e6ee6a8f582eae5 (patch) | |
| tree | 0df8513839cdbd5f6993df6602db62b0e5a718e0 | |
| parent | 0d054318d5349a60922b30f2cf572b8b613712f7 (diff) | |
| parent | 56a678344273fd63f8ade26876283a2586a9bf3a (diff) | |
| download | op-kernel-dev-08d0a9757d5f6215a24b918a9e6ee6a8f582eae5.zip op-kernel-dev-08d0a9757d5f6215a24b918a9e6ee6a8f582eae5.tar.gz | |
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
| -rw-r--r-- | sound/soc/soc-dapm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index b941908..bd16010 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2733,7 +2733,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, } mutex_unlock(&card->dapm_mutex); - return 0; + return change; } EXPORT_SYMBOL_GPL(snd_soc_dapm_put_volsw); @@ -2861,7 +2861,6 @@ int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol, struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; int change; - int ret = 0; int wi; if (ucontrol->value.enumerated.item[0] >= e->max) @@ -2881,7 +2880,7 @@ int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol, } mutex_unlock(&card->dapm_mutex); - return ret; + return change; } EXPORT_SYMBOL_GPL(snd_soc_dapm_put_enum_virt); |
