diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:06 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:06 +0000 |
| commit | 7a869e108e5d82b021a6ce10d25e97e6b7f5823a (patch) | |
| tree | 27f832ff7b47b6d3200a084afd0c8ef4ad4a7078 /sound/soc/codecs/tlv320aic3x.c | |
| parent | 7d590e462315f40f821599bcc0b2b6b7f62142a8 (diff) | |
| parent | 60d66c9a24907c8c965be4c7d15f67bd9d54b553 (diff) | |
Merge remote-tracking branch 'asoc/topic/w-codec' into asoc-next
Diffstat (limited to 'sound/soc/codecs/tlv320aic3x.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index dd222b10ce13..07603d142923 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -197,7 +197,7 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol, static int mic_bias_event(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); struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec); switch (event) { |