summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-28 13:22:14 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-28 13:22:14 +0000
commit1166f985d3b6b4ef8a48a13f56520870d86085c3 (patch)
tree4dbf63fcf70480ff10298482b53660af6e00be16 /sound/soc/soc-dapm.c
parentdddf3e4c257879bc35cda3f542507c43f2648a2a (diff)
parente9cf7049330cd44c8af43b0c5c7bef25a086c5b7 (diff)
downloadblackbird-op-linux-1166f985d3b6b4ef8a48a13f56520870d86085c3.tar.gz
blackbird-op-linux-1166f985d3b6b4ef8a48a13f56520870d86085c3.zip
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 0f94fd057f29..d0342aab2c15 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 */
OpenPOWER on IntegriCloud