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/wm8955.c | |
| parent | 103004749235915190b81108f6bf4dbf53f220b9 (diff) | |
| parent | 60d66c9a24907c8c965be4c7d15f67bd9d54b553 (diff) | |
Merge remote-tracking branch 'asoc/topic/w-codec' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8955.c')
| -rw-r--r-- | sound/soc/codecs/wm8955.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index 1173f7fef5a7..1ab2d462afad 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c @@ -333,7 +333,7 @@ static int wm8955_configure_clocking(struct snd_soc_codec *codec) static int wm8955_sysclk(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); int ret = 0; /* Always disable the clocks - if we're doing reconfiguration this |