Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...

[linux-2.6-block.git] / sound / soc / codecs / cq93vc.c

diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c
index 347a567b01e16e6a8a3eb370c6d8cba5ac1af914..b8066ef10bb0ae65dcf3b49582fe89329e17f09c 100644 (file)
--- a/sound/soc/codecs/cq93vc.c
+++ b/sound/soc/codecs/cq93vc.c
@@ -153,7 +153,8 @@ static int cq93vc_resume(struct snd_soc_codec *codec)
 
 static int cq93vc_probe(struct snd_soc_codec *codec)
 {
-       struct davinci_vc *davinci_vc = snd_soc_codec_get_drvdata(codec);
+       struct davinci_vc *davinci_vc =
+                       mfd_get_data(to_platform_device(codec->dev));
 
        davinci_vc->cq93vc.codec = codec;
        codec->control_data = davinci_vc;