diff options
| author | Michele Ballabio <barra_cuda@katamail.com> | 2010-03-06 21:06:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-26 07:47:50 -0700 |
| commit | 4834ffcbc9293b3db44d4f336dad38c8bfd272ab (patch) | |
| tree | 65ac7c22463daf90b0eff598d9e59224ab6127f7 /sound | |
| parent | 6658958a7f9a980b50037d721ea248232821e72c (diff) | |
ALSA: hda - Add ASRock mobo to MSI blacklist
commit 4193d13b2c2b694aa59e629e6daf6269d7922f13 upstream.
This avoids a lockup at boot.
Signed-off-by: Michele Ballabio <barra_cuda@katamail.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/hda/hda_intel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 9ace8eb0207c..aed9e0feaefd 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2357,6 +2357,7 @@ static struct snd_pci_quirk msi_black_list[] __devinitdata = { SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */ SND_PCI_QUIRK(0x1043, 0x822d, "ASUS", 0), /* Athlon64 X2 + nvidia MCP55 */ + SND_PCI_QUIRK(0x1849, 0x0888, "ASRock", 0), /* Athlon64 X2 + nvidia */ {} }; |