diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-01-12 09:48:20 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-01-12 09:48:20 +0100 |
commit | 29abceb67f8a230da806db4ed73899595bd2ae76 (patch) | |
tree | da4923281e11211dfcba6e92065fd76c0611a389 /include/sound | |
parent | d6b24507972341e5babdca8e25448325c9137232 (diff) | |
parent | 36ae1a96c4dcb0f6581d595cc5d43cf3a7e648c7 (diff) | |
download | linux-29abceb67f8a230da806db4ed73899595bd2ae76.tar.bz2 |
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into topic/asoc
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/soc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index f75d1ccc5c58..0992dff55959 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -847,7 +847,7 @@ struct snd_soc_card { /* SoC machine DAI configuration, glues a codec and cpu DAI together */ struct snd_soc_pcm_runtime { - struct device dev; + struct device *dev; struct snd_soc_card *card; struct snd_soc_dai_link *dai_link; struct mutex pcm_mutex; @@ -933,12 +933,12 @@ static inline void *snd_soc_platform_get_drvdata(struct snd_soc_platform *platfo static inline void snd_soc_pcm_set_drvdata(struct snd_soc_pcm_runtime *rtd, void *data) { - dev_set_drvdata(&rtd->dev, data); + dev_set_drvdata(rtd->dev, data); } static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd) { - return dev_get_drvdata(&rtd->dev); + return dev_get_drvdata(rtd->dev); } static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card) |