diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-04 23:57:06 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-04 23:57:06 +0300 |
commit | 7a869e108e5d82b021a6ce10d25e97e6b7f5823a (patch) | |
tree | 27f832ff7b47b6d3200a084afd0c8ef4ad4a7078 /sound/soc/codecs/wm8904.c | |
parent | 7d590e462315f40f821599bcc0b2b6b7f62142a8 (diff) | |
parent | 60d66c9a24907c8c965be4c7d15f67bd9d54b553 (diff) | |
download | linux-7a869e108e5d82b021a6ce10d25e97e6b7f5823a.tar.xz |
Merge remote-tracking branch 'asoc/topic/w-codec' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8904.c')
-rw-r--r-- | sound/soc/codecs/wm8904.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 75b87c5c0f04..c5eaa0198ef0 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -673,7 +673,7 @@ static int cp_event(struct snd_soc_dapm_widget *w, static int sysclk_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 wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); switch (event) { @@ -711,7 +711,7 @@ static int sysclk_event(struct snd_soc_dapm_widget *w, static int out_pga_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 wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); int reg, val; int dcs_mask; |