summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-15 19:54:18 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-15 19:54:18 -0800
commitd277993f78b8a5376477c487208d82bc4fecab95 (patch)
treefba9ac78f7cbea7f62f1f1f983df2f2663746f1f /sound
parent65d269538a1129495ac45a14a777cd11cfe881d8 (diff)
parent0a27fcfaaf61108d94f0377f91bed81b2dd35f52 (diff)
downloadblackbird-op-linux-d277993f78b8a5376477c487208d82bc4fecab95.tar.gz
blackbird-op-linux-d277993f78b8a5376477c487208d82bc4fecab95.zip
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Correct ASUA blacklist for MSI brokenness
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 3600e9cc9bc6..ff6da6f386d1 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2350,7 +2350,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 */
+ SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */
{}
};
OpenPOWER on IntegriCloud