aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-01-27 20:26:08 +0100
committerTakashi Iwai <tiwai@suse.de>2010-01-27 20:26:08 +0100
commit8ce28d6abff34886d3797b25324c940471b99164 (patch)
tree5addcc9fea8005c07e1a0802d67c07feea63fffc /sound
parent973b8cb0ead3e0b1dd3ee7b2df52e4dff1ffc707 (diff)
downloadlinux-2.6.34-ux500-8ce28d6abff34886d3797b25324c940471b99164.tar.gz
ALSA: hda - Add an ASUS mobo to MSI blacklist
Sid Boyce reported that his machine locks up without enable_msi=0 option. This looks like another ASUS mobo with Nvidia combo. Reported-by: Sid Boyce <sboyce@blueyonder.co.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index ec9c348336c..565de38a3fc 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2332,6 +2332,7 @@ static void __devinit check_probe_mask(struct azx *chip, int dev)
*/
static struct snd_pci_quirk msi_black_list[] __devinitdata = {
SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */
+ SND_PCI_QUIRK(0x1043, 0x829c, "ASUS", 0), /* nvidia */
{}
};