From: Michele Ballabio Date: Sat, 6 Mar 2010 20:06:46 +0000 (+0100) Subject: ALSA: hda - Add ASRock mobo to MSI blacklist X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4193d13b2c2b694aa59e629e6daf6269d7922f13;p=openwrt%2Fstaging%2Fblogic.git ALSA: hda - Add ASRock mobo to MSI blacklist This avoids a lockup at boot. Signed-off-by: Michele Ballabio Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 94b444e6fed3..e37bffec749a 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2358,6 +2358,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, 0x81f6, "ASUS", 0), /* nvidia */ + SND_PCI_QUIRK(0x1849, 0x0888, "ASRock", 0), /* Athlon64 X2 + nvidia */ {} };