Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-next

ac92f112 · Mark Brown · 0b0ddfa5 · a5ccea22 · ac92f112
Commit ac92f112 authored Dec 10, 2012 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/codecs/wm2000.c sound/soc/codecs/wm2000.c +1 -1

No files found.
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -646,7 +646,7 @@ static const struct snd_kcontrol_new wm2000_controls[] = {
 static int wm2000_anc_power_event(struct snd_soc_dapm_widget *w,
 				  struct snd_kcontrol *kcontrol, int event)
 {
-	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+	struct snd_soc_codec *codec = w->codec;
 	struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);

 	if (SND_SOC_DAPM_EVENT_ON(event))