diff options
| author | Michele Ballabio <barra_cuda@katamail.com> | 2010-03-06 21:06:46 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-07 09:29:39 +0100 |
| commit | 4193d13b2c2b694aa59e629e6daf6269d7922f13 (patch) | |
| tree | 3cbfec232dbb3e080fb995a6e3dc84f6e70f3a08 /sound | |
| parent | Merge branch 'fix/hda' into topic/hda (diff) | |
| download | linux-4193d13b2c2b694aa59e629e6daf6269d7922f13.tar.xz linux-4193d13b2c2b694aa59e629e6daf6269d7922f13.zip | |
ALSA: hda - Add ASRock mobo to MSI blacklist
This avoids a lockup at boot.
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Takashi Iwai <tiwai@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 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 */ {} }; |