diff options
author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2007-05-10 13:27:27 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-16 05:45:28 -0400 |
commit | a68660e0c63d8f7ab8725f9e771119c08e9f953b (patch) | |
tree | a9a9d78e07320a8ba0650037f31f3778ebed148e /include | |
parent | 9ae67c7b870f5220a6b30e4f6e83b319bd9be718 (diff) |
[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 'include')
-rw-r--r-- | include/sound/soc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index b1dc364b8f74..db6edba8ef08 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <sound/control.h> | 22 | #include <sound/control.h> |
23 | #include <sound/ac97_codec.h> | 23 | #include <sound/ac97_codec.h> |
24 | 24 | ||
25 | #define SND_SOC_VERSION "0.13.0" | 25 | #define SND_SOC_VERSION "0.13.1" |
26 | 26 | ||
27 | /* | 27 | /* |
28 | * Convenience kcontrol builders | 28 | * Convenience kcontrol builders |
@@ -83,6 +83,7 @@ | |||
83 | #define SND_SOC_DAI_AC97 0x1 | 83 | #define SND_SOC_DAI_AC97 0x1 |
84 | #define SND_SOC_DAI_I2S 0x2 | 84 | #define SND_SOC_DAI_I2S 0x2 |
85 | #define SND_SOC_DAI_PCM 0x4 | 85 | #define SND_SOC_DAI_PCM 0x4 |
86 | #define SND_SOC_DAI_AC97_BUS 0x8 /* for custom i.e. non ac97_codec.c */ | ||
86 | 87 | ||
87 | /* | 88 | /* |
88 | * DAI hardware audio formats | 89 | * DAI hardware audio formats |
@@ -278,6 +279,7 @@ struct snd_soc_cpu_ops { | |||
278 | struct snd_soc_codec_dai { | 279 | struct snd_soc_codec_dai { |
279 | char *name; | 280 | char *name; |
280 | int id; | 281 | int id; |
282 | unsigned char type; | ||
281 | 283 | ||
282 | /* DAI capabilities */ | 284 | /* DAI capabilities */ |
283 | struct snd_soc_pcm_stream playback; | 285 | struct snd_soc_pcm_stream playback; |