diff options
author | Jiri Kosina | 2011-02-15 10:24:31 +0100 |
---|---|---|
committer | Jiri Kosina | 2011-02-15 10:24:31 +0100 |
commit | 0a9d59a2461477bd9ed143c01af9df3f8f00fa81 (patch) | |
tree | df997d1cfb0786427a0df1fbd6f0640fa4248cf4 /sound/soc/codecs/cq93vc.c | |
parent | MAINTAINERS: fix sorting (diff) | |
parent | klist: Fix object alignment on 64-bit. (diff) | |
download | kernel-qcow2-linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.tar.gz kernel-qcow2-linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.tar.xz kernel-qcow2-linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.zip |
Merge branch 'master' into for-next
Diffstat (limited to 'sound/soc/codecs/cq93vc.c')
-rw-r--r-- | sound/soc/codecs/cq93vc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 46dbfd067f79..347a567b01e1 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c @@ -153,7 +153,7 @@ static int cq93vc_resume(struct snd_soc_codec *codec) static int cq93vc_probe(struct snd_soc_codec *codec) { - struct davinci_vc *davinci_vc = codec->dev->platform_data; + struct davinci_vc *davinci_vc = snd_soc_codec_get_drvdata(codec); davinci_vc->cq93vc.codec = codec; codec->control_data = davinci_vc; |