* [PATCH] ALSA: hda - Add ASRock mobo to MSI blacklist
@ 2010-03-06 20:06 Michele Ballabio
2010-03-07 8:30 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Michele Ballabio @ 2010-03-06 20:06 UTC (permalink / raw)
To: linux-kernel; +Cc: tiwai, perex
This avoids a lockup at boot.
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ALSA: hda - Add ASRock mobo to MSI blacklist
2010-03-06 20:06 [PATCH] ALSA: hda - Add ASRock mobo to MSI blacklist Michele Ballabio
@ 2010-03-07 8:30 ` Takashi Iwai
2010-03-19 0:07 ` Michele Ballabio
0 siblings, 1 reply; 4+ messages in thread
From: Takashi Iwai @ 2010-03-07 8:30 UTC (permalink / raw)
To: Michele Ballabio; +Cc: linux-kernel, perex
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@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
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ALSA: hda - Add ASRock mobo to MSI blacklist
2010-03-07 8:30 ` Takashi Iwai
@ 2010-03-19 0:07 ` Michele Ballabio
2010-03-19 7:19 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Michele Ballabio @ 2010-03-19 0:07 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-kernel, perex, stable
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@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 */
> > {}
> > };
> >
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ALSA: hda - Add ASRock mobo to MSI blacklist
2010-03-19 0:07 ` Michele Ballabio
@ 2010-03-19 7:19 ` Takashi Iwai
0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2010-03-19 7:19 UTC (permalink / raw)
To: Michele Ballabio; +Cc: linux-kernel, perex, stable
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@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 */
> > > {}
> > > };
> > >
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-03-19 7:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-06 20:06 [PATCH] ALSA: hda - Add ASRock mobo to MSI blacklist Michele Ballabio
2010-03-07 8:30 ` Takashi Iwai
2010-03-19 0:07 ` Michele Ballabio
2010-03-19 7:19 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).