diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-23 12:05:01 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-23 12:05:01 +0100 |
| commit | ce24f58a1187ca3058d72c3f897e3b574209ab20 (patch) | |
| tree | f84384469aca4c6660c4f12bee3e99deb16221ec /sound/soc/codecs/uda134x.c | |
| parent | 5a8826463c19b0d1a2fc60b2adac0ec318047844 (diff) | |
| parent | 333802e90d3f0366c4a1cb767e2783d2e1df73a8 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/uda134x.c')
| -rw-r--r-- | sound/soc/codecs/uda134x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index e76847a9438..48ffd406a71 100644 --- a/sound/soc/codecs/uda134x.c +++ b/sound/soc/codecs/uda134x.c @@ -486,7 +486,8 @@ static struct snd_soc_dai_driver uda134x_dai = { static int uda134x_soc_probe(struct snd_soc_codec *codec) { struct uda134x_priv *uda134x; - struct uda134x_platform_data *pd = dev_get_drvdata(codec->card->dev); + struct uda134x_platform_data *pd = codec->card->dev->platform_data; + int ret; printk(KERN_INFO "UDA134X SoC Audio Codec\n"); |