Skip to content

Commit

Permalink
ASoC: dapm: Fix return value of snd_soc_dapm_put_{volsw,enum_virt}()
Browse files Browse the repository at this point in the history
The ALSA core expect the put callback of a control to return 1 if the value of
the control changed and 0 if it did not. Both snd_soc_dapm_put_volsw() and
snd_soc_dapm_put_enum_virt() currently always returns 0. For both functions we
already have a 'change' variable which either contains 1 or 0 depending on
whether the value has changed or not, so just return that.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Jul 24, 2013
1 parent 3b2f64d commit 56a6783
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions sound/soc/soc-dapm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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)
Expand All @@ -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);

Expand Down

0 comments on commit 56a6783

Please sign in to comment.