This fixes a regression introduced by: 97404f2e0386ac147cec00fc5d89ea475b04bd78 ASoC: Do DAPM control updates in the middle of DAPM sequences
Signed-off-by: Stephen Warren swarren@nvidia.com --- sound/soc/soc-dapm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 0f94fd0..d0342aa 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1779,7 +1779,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, int max = mc->max; unsigned int mask = (1 << fls(max)) - 1; unsigned int invert = mc->invert; - unsigned int val, val_mask; + unsigned int val; int connect, change; struct snd_soc_dapm_update update;
@@ -1787,13 +1787,13 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
if (invert) val = max - val; - val_mask = mask << shift; + mask = mask << shift; val = val << shift;
mutex_lock(&widget->codec->mutex); widget->value = val;
- change = snd_soc_test_bits(widget->codec, reg, val_mask, val); + change = snd_soc_test_bits(widget->codec, reg, mask, val); if (change) { if (val) /* new connection */