diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2009-07-22 13:01:03 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-23 11:30:56 +0100 |
| commit | 474828a40f6ddab6e2a3475a19c5c84aa3ec7d60 (patch) | |
| tree | 15da7b963bbe20704bca139b355a020686f97a52 /sound/soc/soc-core.c | |
| parent | a7569afa8b79ca9272b0d7544335bc05b5b721d6 (diff) | |
| download | lwn-474828a40f6ddab6e2a3475a19c5c84aa3ec7d60.tar.gz lwn-474828a40f6ddab6e2a3475a19c5c84aa3ec7d60.zip | |
ALSA: Allow passing platform_data to devices attached to AC97 bus
This patch allows passing platform_data to devices attached to AC97 bus
(like touchscreens, battery measurement chips ...).
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 8bf49a4e664a..5eabb7117608 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -28,6 +28,7 @@ #include <linux/bitops.h> #include <linux/debugfs.h> #include <linux/platform_device.h> +#include <sound/ac97_codec.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -1461,8 +1462,11 @@ int snd_soc_init_card(struct snd_soc_device *socdev) continue; } } - if (card->dai_link[i].codec_dai->ac97_control) + if (card->dai_link[i].codec_dai->ac97_control) { ac97 = 1; + snd_ac97_dev_add_pdata(codec->ac97, + card->dai_link[i].cpu_dai->ac97_pdata); + } } snprintf(codec->card->shortname, sizeof(codec->card->shortname), "%s", card->name); |