diff options
| author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2007-05-10 19:27:27 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-16 11:45:28 +0200 |
| commit | a68660e0c63d8f7ab8725f9e771119c08e9f953b (patch) | |
| tree | a9a9d78e07320a8ba0650037f31f3778ebed148e /sound/soc/codecs | |
| parent | 9ae67c7b870f5220a6b30e4f6e83b319bd9be718 (diff) | |
| download | op-kernel-dev-a68660e0c63d8f7ab8725f9e771119c08e9f953b.zip op-kernel-dev-a68660e0c63d8f7ab8725f9e771119c08e9f953b.tar.gz | |
[ALSA] ASoC AC97 device reg bugfix
This patch fixes a bug whereby AC97 bus device data was being clobbered
when AC97 codecs using the generic ac97_codec.c driver were being
registered. Codecs that didn't use the generic driver were unaffected
(e.g. WM9712, WM9713).
Changes:-
o Add new AC97 codec class for custom (or need bus dev registration)
AC97 codecs.
o Only register/deregister this custom codec device with the AC97 bus.
The generic AC97 driver already does this for generic codec devices.
This may be related to bug #3038 :-
https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3038
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/ac97.c | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/wm9712.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c index f3b3b9e..0b8a6f8 100644 --- a/sound/soc/codecs/ac97.c +++ b/sound/soc/codecs/ac97.c @@ -45,6 +45,7 @@ static int ac97_prepare(struct snd_pcm_substream *substream) struct snd_soc_codec_dai ac97_dai = { .name = "AC97 HiFi", + .type = SND_SOC_DAI_AC97, .playback = { .stream_name = "AC97 Playback", .channels_min = 1, diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 264413a..986b5d59 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -544,6 +544,7 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream) struct snd_soc_codec_dai wm9712_dai[] = { { .name = "AC97 HiFi", + .type = SND_SOC_DAI_AC97_BUS, .playback = { .stream_name = "HiFi Playback", .channels_min = 1, |
