diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-28 08:22:14 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-28 08:22:14 -0500 |
commit | 1166f985d3b6b4ef8a48a13f56520870d86085c3 (patch) | |
tree | 4dbf63fcf70480ff10298482b53660af6e00be16 /sound/soc/soc-dapm.c | |
parent | dddf3e4c257879bc35cda3f542507c43f2648a2a (diff) | |
parent | e9cf7049330cd44c8af43b0c5c7bef25a086c5b7 (diff) |
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.c | 6 |
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, | |||
1779 | int max = mc->max; | 1779 | int max = mc->max; |
1780 | unsigned int mask = (1 << fls(max)) - 1; | 1780 | unsigned int mask = (1 << fls(max)) - 1; |
1781 | unsigned int invert = mc->invert; | 1781 | unsigned int invert = mc->invert; |
1782 | unsigned int val, val_mask; | 1782 | unsigned int val; |
1783 | int connect, change; | 1783 | int connect, change; |
1784 | struct snd_soc_dapm_update update; | 1784 | struct snd_soc_dapm_update update; |
1785 | 1785 | ||
@@ -1787,13 +1787,13 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, | |||
1787 | 1787 | ||
1788 | if (invert) | 1788 | if (invert) |
1789 | val = max - val; | 1789 | val = max - val; |
1790 | val_mask = mask << shift; | 1790 | mask = mask << shift; |
1791 | val = val << shift; | 1791 | val = val << shift; |
1792 | 1792 | ||
1793 | mutex_lock(&widget->codec->mutex); | 1793 | mutex_lock(&widget->codec->mutex); |
1794 | widget->value = val; | 1794 | widget->value = val; |
1795 | 1795 | ||
1796 | change = snd_soc_test_bits(widget->codec, reg, val_mask, val); | 1796 | change = snd_soc_test_bits(widget->codec, reg, mask, val); |
1797 | if (change) { | 1797 | if (change) { |
1798 | if (val) | 1798 | if (val) |
1799 | /* new connection */ | 1799 | /* new connection */ |