summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorDaniel T Chen <crimsun@ubuntu.com>2010-08-18 19:33:43 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-26 16:41:55 -0700
commit6050ea567c87824d22eb3a6ceee2b08fe93129ef (patch)
tree6019c1607b2d110f1ccafba4bc8d5deda1014830 /sound
parentf4639cb64cd369ff73c45e39c33cb9ea99733c2e (diff)
downloadlinux-stable-6050ea567c87824d22eb3a6ceee2b08fe93129ef.tar.gz
linux-stable-6050ea567c87824d22eb3a6ceee2b08fe93129ef.tar.bz2
linux-stable-6050ea567c87824d22eb3a6ceee2b08fe93129ef.zip
ALSA: intel8x0: Mute External Amplifier by default for ThinkPad X31
commit 9c77b846ec8b4e0c7107dd7f820172462dc84a61 upstream. BugLink: https://bugs.launchpad.net/bugs/619439 This ThinkPad model needs External Amplifier muted for audible playback, so set the inv_eapd quirk for it. Reported-and-tested-by: Dennis Bell <dennis.bell@parkerg.co.uk> 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/intel8x0.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index aac20fb4aad2..4196e3dee7d7 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -1776,6 +1776,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
},
{
.subvendor = 0x1014,
+ .subdevice = 0x0534,
+ .name = "ThinkPad X31",
+ .type = AC97_TUNE_INV_EAPD
+ },
+ {
+ .subvendor = 0x1014,
.subdevice = 0x1f00,
.name = "MS-9128",
.type = AC97_TUNE_ALC_JACK