ASoC: Fix mask/val_mask confusion snd_soc_dapm_put_volsw()
authorStephen Warren <swarren@nvidia.com>
Thu, 27 Jan 2011 21:54:05 +0000 (14:54 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 28 Jan 2011 13:19:19 +0000 (13:19 +0000)
commite9cf7049330cd44c8af43b0c5c7bef25a086c5b7
tree4ab14e007ccdf79efd7dba846566750f0583d6c2
parent0fa63b69284c9bbedf876c677a9e650243cc40be
ASoC: Fix mask/val_mask confusion snd_soc_dapm_put_volsw()

snd_soc_dapm_put_volsw() has variables for both the unshifted and
shifted mask for updates commit 97404f (ASoC: Do DAPM control updates in
the middle of DAPM sequences) got confused between the two of these.
Since there's no need to keep a copy of the unshifted mask fix this and
simplify the code by using only one mask variable.

[Completely rewrote the changelog to describe the issue -- broonie.]

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/soc-dapm.c