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/wm8731.c | |
| parent | 7d590e462315f40f821599bcc0b2b6b7f62142a8 (diff) | |
| parent | 60d66c9a24907c8c965be4c7d15f67bd9d54b553 (diff) | |
| download | op-kernel-dev-7a869e108e5d82b021a6ce10d25e97e6b7f5823a.zip op-kernel-dev-7a869e108e5d82b021a6ce10d25e97e6b7f5823a.tar.gz | |
Merge remote-tracking branch 'asoc/topic/w-codec' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8731.c')
| -rw-r--r-- | sound/soc/codecs/wm8731.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index b115ed8..098c143 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -217,7 +217,8 @@ SND_SOC_DAPM_INPUT("LLINEIN"), static int wm8731_check_osc(struct snd_soc_dapm_widget *source, struct snd_soc_dapm_widget *sink) { - struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(source->codec); + struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm); + struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); return wm8731->sysclk_type == WM8731_SYSCLK_XTAL; } |
