Skip to contentSkip to conversation

ALSA: hda - Add ASRock mobo to MSI blacklist

PATCH In review Michele Ballabio 2 participants 4 messages Mar 6, 2010 – Mar 19, 2010 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: hda - Add ASRock mobo to MSI blacklist

This avoids a lockup at boot.

---
 sound/pci/hda/hda_intel.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
sound/pci/hda/hda_intel.c +1 -0
index ff6da6f..1306193 100644
@@ -2351,6 +2351,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 */
 	{}
 };
 
Signature · 1 line
1.7.0
#1 lore raw

At Sat, 6 Mar 2010 21:06:46 +0100,

Quoted 4 lines · Michele Ballabio

This avoids a lockup at boot.

Applied now. Thanks.

Takashi

Quoted 20 lines
---
 sound/pci/hda/hda_intel.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
sound/pci/hda/hda_intel.c +1 -0
index ff6da6f..1306193 100644
@@ -2351,6 +2351,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 */
 	{}
 };
 
Signature · 1 line
1.7.0
#2 lore raw
Quoted 11 lines · Takashi Iwai

At Sat, 6 Mar 2010 21:06:46 +0100,

Quoted 4 lines · Michele Ballabio

This avoids a lockup at boot.

Applied now. Thanks.

Takashi

This patch should go to the -stable queue (on CC) for 2.6.33.x, too. Sorry, I should have said it before.

This is commit 4193d13b2c2b694aa59e629e6daf6269d7922f13 upstream.

Quoted 16 lines
Quoted 16 lines
---
 sound/pci/hda/hda_intel.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
sound/pci/hda/hda_intel.c +1 -0
index ff6da6f..1306193 100644
@@ -2351,6 +2351,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 */
 	{}
 };
 
#3 lore raw

At Fri, 19 Mar 2010 01:07:03 +0100,

Quoted 12 lines · Michele Ballabio
Quoted 10 lines · Takashi Iwai

At Sat, 6 Mar 2010 21:06:46 +0100,

Quoted 4 lines · Michele Ballabio

This avoids a lockup at boot.

Applied now. Thanks.

Quoted 7 lines
Quoted 1 line

Takashi

This patch should go to the -stable queue (on CC) for 2.6.33.x, too. Sorry, I should have said it before.

This is commit 4193d13b2c2b694aa59e629e6daf6269d7922f13 upstream.

Don't worry, another commit will cover yours, too. MSI is enabled with Nvidia controllers now.

Takashi

Quoted 17 lines
Quoted 16 lines
Quoted 16 lines
---
 sound/pci/hda/hda_intel.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
sound/pci/hda/hda_intel.c +1 -0
index ff6da6f..1306193 100644
@@ -2351,6 +2351,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 */
 	{}
 };