ALSA: hda - Add ASRock mobo to MSI blacklist
in [Kernel]
|
Prev: [PATCH 4/5] staging: et131x: et1310_eeprom: Fix code style issues from checkpatch.pl
Next: drivers/net/mac8390.c: Remove useless memcpy casting
From: Takashi Iwai on 7 Mar 2010 03:40 At Sat, 6 Mar 2010 21:06:46 +0100, Michele Ballabio wrote: > > This avoids a lockup at boot. > > Signed-off-by: Michele Ballabio <barra_cuda(a)katamail.com> Applied now. Thanks. Takashi > --- > 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 ff6da6f..1306193 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -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 */ > {} > }; > > -- > 1.7.0 > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Michele Ballabio on 18 Mar 2010 20:10 On Sunday 07 March 2010, Takashi Iwai wrote: > At Sat, 6 Mar 2010 21:06:46 +0100, > Michele Ballabio wrote: > > > > This avoids a lockup at boot. > > > > Signed-off-by: Michele Ballabio <barra_cuda(a)katamail.com> > > 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. > > --- > > 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 ff6da6f..1306193 100644 > > --- a/sound/pci/hda/hda_intel.c > > +++ b/sound/pci/hda/hda_intel.c > > @@ -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 */ > > {} > > }; > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Takashi Iwai on 19 Mar 2010 03:20
At Fri, 19 Mar 2010 01:07:03 +0100, Michele Ballabio wrote: > > On Sunday 07 March 2010, Takashi Iwai wrote: > > At Sat, 6 Mar 2010 21:06:46 +0100, > > Michele Ballabio wrote: > > > > > > This avoids a lockup at boot. > > > > > > Signed-off-by: Michele Ballabio <barra_cuda(a)katamail.com> > > > > 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. Don't worry, another commit will cover yours, too. MSI is enabled with Nvidia controllers now. Takashi > > > --- > > > 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 ff6da6f..1306193 100644 > > > --- a/sound/pci/hda/hda_intel.c > > > +++ b/sound/pci/hda/hda_intel.c > > > @@ -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 */ > > > {} > > > }; > > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |