From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752721Ab0CGIa5 (ORCPT ); Sun, 7 Mar 2010 03:30:57 -0500 Received: from cantor2.suse.de ([195.135.220.15]:48381 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752175Ab0CGIa4 (ORCPT ); Sun, 7 Mar 2010 03:30:56 -0500 Date: Sun, 07 Mar 2010 09:30:55 +0100 Message-ID: From: Takashi Iwai To: Michele Ballabio Cc: linux-kernel@vger.kernel.org, perex@perex.cz Subject: Re: [PATCH] ALSA: hda - Add ASRock mobo to MSI blacklist In-Reply-To: <201003062106.47245.barra_cuda@katamail.com> References: <201003062106.47245.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 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 > --- > 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 > >