diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-28 13:22:14 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-28 13:22:14 (GMT) |
| commit | 1166f985d3b6b4ef8a48a13f56520870d86085c3 (patch) | |
| tree | 4dbf63fcf70480ff10298482b53660af6e00be16 /sound/soc/codecs | |
| parent | dddf3e4c257879bc35cda3f542507c43f2648a2a (diff) | |
| parent | e9cf7049330cd44c8af43b0c5c7bef25a086c5b7 (diff) | |
| download | linux-fsl-qoriq-1166f985d3b6b4ef8a48a13f56520870d86085c3.tar.xz | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/codecs')
| -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 46dbfd0..347a567 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; |