summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-04 18:30:03 +0100
committerMark Brown <broonie@linaro.org>2013-07-04 18:30:03 +0100
commit70a9f8797ce298544cfd07328ff59f00488bc491 (patch)
tree24625d98dc2dab64972320fe3db5e6ee9353d60a /sound
parent58be9a93111cfb1484a60b44306d67ffd85f68c9 (diff)
parent4642aabd21d0491a7d9dcbe789bdf93a596f771c (diff)
downloadlinux-70a9f8797ce298544cfd07328ff59f00488bc491.tar.bz2
Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8962.c2
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;