diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-28 13:22:14 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-28 13:22:14 +0000 |
| commit | 1166f985d3b6b4ef8a48a13f56520870d86085c3 (patch) | |
| tree | 4dbf63fcf70480ff10298482b53660af6e00be16 | |
| parent | dddf3e4c257879bc35cda3f542507c43f2648a2a (diff) | |
| parent | e9cf7049330cd44c8af43b0c5c7bef25a086c5b7 (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
| -rw-r--r-- | sound/soc/codecs/cq93vc.c | 2 | ||||
| -rw-r--r-- | sound/soc/soc-dapm.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 46dbfd067f7..347a567b01e 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c @@ -153,7 +153,7 @@ static int cq93vc_resume(struct snd_soc_codec *codec) static int cq93vc_probe(struct snd_soc_codec *codec) { - struct davinci_vc *davinci_vc = codec->dev->platform_data; + struct davinci_vc *davinci_vc = snd_soc_codec_get_drvdata(codec); davinci_vc->cq93vc.codec = codec; codec->control_data = davinci_vc; diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 0f94fd057f2..d0342aab2c1 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 */ |