aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2005-05-05 19:15:08 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-05 19:36:31 -0400
commitbecf3aec2608d6807a58d0677661cb23c388d67f (patch)
tree37c6cc1b13b2c66389fd5805ab538c38c8c5b55e /sound/oss
parent60d300c02fe2e0be9bb02904361e41e0307264b2 (diff)
[PATCH] Add CXT48 to modem black list in ac97
The following patch works around the misdetection of the CXT48 codec as a modem by the OSS ac97 driver. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/ac97_codec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c
index 124b1e10a13d..3ecef4689f1b 100644
--- a/sound/oss/ac97_codec.c
+++ b/sound/oss/ac97_codec.c
@@ -155,6 +155,7 @@ static const struct {
155 {0x43525931, "Cirrus Logic CS4299 rev A", &crystal_digital_ops}, 155 {0x43525931, "Cirrus Logic CS4299 rev A", &crystal_digital_ops},
156 {0x43525933, "Cirrus Logic CS4299 rev C", &crystal_digital_ops}, 156 {0x43525933, "Cirrus Logic CS4299 rev C", &crystal_digital_ops},
157 {0x43525934, "Cirrus Logic CS4299 rev D", &crystal_digital_ops}, 157 {0x43525934, "Cirrus Logic CS4299 rev D", &crystal_digital_ops},
158 {0x43585430, "CXT48", &default_ops, AC97_DELUDED_MODEM },
158 {0x43585442, "CXT66", &default_ops, AC97_DELUDED_MODEM }, 159 {0x43585442, "CXT66", &default_ops, AC97_DELUDED_MODEM },
159 {0x44543031, "Diamond Technology DT0893", &default_ops}, 160 {0x44543031, "Diamond Technology DT0893", &default_ops},
160 {0x45838308, "ESS Allegro ES1988", &null_ops}, 161 {0x45838308, "ESS Allegro ES1988", &null_ops},