At Sat, 6 Mar 2010 21:06:46 +0100,
Michele Ballabio wrote:
quoted text
> 
> This avoids a lockup at boot.
> 
> Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>

Applied now.  Thanks.


Takashi

quoted text
> ---
>  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
> 
> 
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/