diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:03 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:03 +0800 |
commit | e1e62305afa275b435c8215dc0e799e6f188fe4f (patch) | |
tree | def8ca2756b48e5e948c65e9f5aa5d932a763c14 /sound/soc/codecs/wm9090.c | |
parent | 103004749235915190b81108f6bf4dbf53f220b9 (diff) | |
parent | 60d66c9a24907c8c965be4c7d15f67bd9d54b553 (diff) |
Merge remote-tracking branch 'asoc/topic/w-codec' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm9090.c')
-rw-r--r-- | sound/soc/codecs/wm9090.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c index 6ffe8dc4f3fa..60d243c904f5 100644 --- a/sound/soc/codecs/wm9090.c +++ b/sound/soc/codecs/wm9090.c @@ -254,7 +254,7 @@ SOC_SINGLE_TLV("MIXOUTR IN2B Volume", WM9090_OUTPUT_MIXER4, 0, 3, 1, static int hp_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = w->codec; + struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); unsigned int reg = snd_soc_read(codec, WM9090_ANALOGUE_HP_0); switch (event) { |