diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-02-05 01:08:35 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-02-05 01:08:35 -0500 |
commit | a3ae255e3729c1bb4507412ea29be804f703d44c (patch) | |
tree | edd1ca577dad5a0d701ae111519eaefa60896f98 /sound/soc/codecs/wm8900.c | |
parent | 3fe9cf390f6dc84f76b112b0a660967a84f9a81b (diff) | |
parent | 16ca41c6cc904d7eb9e92afc5f576e375c314f90 (diff) |
Merge tag 'asoc-v3.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.20
More updates for v3.20:
- Lots of refactoring from Lars-Peter Clausen, moving drivers to more
data driven initialization and rationalizing a lot of DAPM usage.
- Much improved handling of CDCLK clocks on Samsung I2S controllers.
- Lots of driver specific cleanups and feature improvements.
- CODEC support for TI PCM514x and TLV320AIC3104 devices.
- Board support for Tegra systems with Realtek RT5677.
Conflicts:
sound/soc/intel/sst-mfld-platform-pcm.c
Diffstat (limited to 'sound/soc/codecs/wm8900.c')
-rw-r--r-- | sound/soc/codecs/wm8900.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index 3a0d4b7d692f..2eb986c19b88 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c | |||
@@ -224,7 +224,7 @@ static void wm8900_reset(struct snd_soc_codec *codec) | |||
224 | static int wm8900_hp_event(struct snd_soc_dapm_widget *w, | 224 | static int wm8900_hp_event(struct snd_soc_dapm_widget *w, |
225 | struct snd_kcontrol *kcontrol, int event) | 225 | struct snd_kcontrol *kcontrol, int event) |
226 | { | 226 | { |
227 | struct snd_soc_codec *codec = w->codec; | 227 | struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); |
228 | u16 hpctl1 = snd_soc_read(codec, WM8900_REG_HPCTL1); | 228 | u16 hpctl1 = snd_soc_read(codec, WM8900_REG_HPCTL1); |
229 | 229 | ||
230 | switch (event) { | 230 | switch (event) { |