summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorDaniel T Chen <crimsun@ubuntu.com>2010-03-25 22:38:15 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-01 15:58:50 -0700
commit08cabf40e01bc3406e9d18ae1c80c471b7a48151 (patch)
tree503e98c175d0c15f54fd1122e140d770df8010d8 /sound
parentcd91c89077519a8743e4d9435760de592f639159 (diff)
downloadlinux-stable-08cabf40e01bc3406e9d18ae1c80c471b7a48151.tar.gz
linux-stable-08cabf40e01bc3406e9d18ae1c80c471b7a48151.tar.bz2
linux-stable-08cabf40e01bc3406e9d18ae1c80c471b7a48151.zip
ALSA: ac97: Add IBM ThinkPad R40e to Headphone/Line Jack Sense blacklist
commit e1f7f02b45cf33a774d56e505ce1718af9392f5e upstream. BugLink: https://launchpad.net/bugs/303789 This model needs both 'Headphone Jack Sense' and 'Line Jack Sense' muted for audible audio, so just add its SSID to the blacklist and don't enumerate the controls. Signed-off-by: Daniel T Chen <crimsun@ubuntu.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/ac97/ac97_patch.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index d103d277c303..e7efcef7b812 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -1867,6 +1867,7 @@ static unsigned int ad1981_jacks_blacklist[] = {
0x10140523, /* Thinkpad R40 */
0x10140534, /* Thinkpad X31 */
0x10140537, /* Thinkpad T41p */
+ 0x1014053e, /* Thinkpad R40e */
0x10140554, /* Thinkpad T42p/R50p */
0x10140567, /* Thinkpad T43p 2668-G7U */
0x10140581, /* Thinkpad X41-2527 */