From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751808Ab0CSHTX (ORCPT ); Fri, 19 Mar 2010 03:19:23 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55677 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751606Ab0CSHTW (ORCPT ); Fri, 19 Mar 2010 03:19:22 -0400 Date: Fri, 19 Mar 2010 08:19:21 +0100 Message-ID: From: Takashi Iwai To: Michele Ballabio Cc: linux-kernel@vger.kernel.org, perex@perex.cz, stable@kernel.org Subject: Re: [PATCH] ALSA: hda - Add ASRock mobo to MSI blacklist In-Reply-To: <201003190107.04074.barra_cuda@katamail.com> References: <201003062106.47245.barra_cuda@katamail.com> <201003190107.04074.barra_cuda@katamail.com> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > > > 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 */ > > > {} > > > }; > > > >