diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:23 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:23 -0500 |
| commit | ac92f112947d6d8c43a6e040f5e5bca87786832a (patch) | |
| tree | 307526b7cbf876d217f1ff8a4f800ce9c4077162 /sound | |
| parent | 0b0ddfa57c52ddc396d1f6a2f8bd3ed9c804c7f4 (diff) | |
| parent | a5ccea22247b8519e098d715ed69c4adbc171f0b (diff) | |
Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm2000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index 683dc43b1d87..02750ab020de 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c | |||
| @@ -646,7 +646,7 @@ static const struct snd_kcontrol_new wm2000_controls[] = { | |||
| 646 | static int wm2000_anc_power_event(struct snd_soc_dapm_widget *w, | 646 | static int wm2000_anc_power_event(struct snd_soc_dapm_widget *w, |
| 647 | struct snd_kcontrol *kcontrol, int event) | 647 | struct snd_kcontrol *kcontrol, int event) |
| 648 | { | 648 | { |
| 649 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 649 | struct snd_soc_codec *codec = w->codec; |
| 650 | struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev); | 650 | struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev); |
| 651 | 651 | ||
| 652 | if (SND_SOC_DAPM_EVENT_ON(event)) | 652 | if (SND_SOC_DAPM_EVENT_ON(event)) |