diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-05 13:54:27 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-05 13:54:27 +0400 |
| commit | 38f0ad7c90c2b2091e7d8689dde294fef27db68b (patch) | |
| tree | 17742c032f74a953054a99ebc04ee6cd7ead2d9d /sound/soc/codecs | |
| parent | 8f0b3b7e222383a21f7d58bd97d5552b3a5dbced (diff) | |
| parent | 70a9f8797ce298544cfd07328ff59f00488bc491 (diff) | |
| download | linux-38f0ad7c90c2b2091e7d8689dde294fef27db68b.tar.xz | |
Merge tag 'asoc-v3.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
A few small fixes, all driver specific. The removal of the GPIO based
pinmuxing is a bug fix, since the obsolete nodes had been removed from
the DT it stopped the driver loading.
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index b1dc7d426438..e2de9ecfd641 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3377,7 +3377,7 @@ static int wm8962_probe(struct snd_soc_codec *codec) { int ret; struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); - struct wm8962_pdata *pdata = dev_get_platdata(codec->dev); + struct wm8962_pdata *pdata = &wm8962->pdata; int i, trigger, irq_pol; bool dmicclk, dmicdat; |