diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-07 09:29:29 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-07 09:29:29 +0100 |
| commit | 7484399fe2f85212754ffdd78121636b47a49a13 (patch) | |
| tree | 75412ae67bfdb605588049848348927b5e1a93ee /sound | |
| parent | d2db09b87eb7b547136d5d25ff1df06820e070bf (diff) | |
| parent | 0a27fcfaaf61108d94f0377f91bed81b2dd35f52 (diff) | |
| download | linux-3.10-7484399fe2f85212754ffdd78121636b47a49a13.tar.gz linux-3.10-7484399fe2f85212754ffdd78121636b47a49a13.tar.bz2 linux-3.10-7484399fe2f85212754ffdd78121636b47a49a13.zip | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index c24bffa08c8..94b444e6fed 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1897,12 +1897,9 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev) if (!bdl_pos_adj[chip->dev_index]) return 1; /* no delayed ack */ - if (azx_dev->period_bytes == 0) { - printk(KERN_WARNING - "hda-intel: Divide by zero was avoided " - "in azx_dev->period_bytes.\n"); - return 0; - } + if (WARN_ONCE(!azx_dev->period_bytes, + "hda-intel: zero azx_dev->period_bytes")) + return 0; /* this shouldn't happen! */ if (pos % azx_dev->period_bytes > azx_dev->period_bytes / 2) return 0; /* NG - it's below the period boundary */ return 1; /* OK, it's fine */ @@ -2360,7 +2357,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, 0x829c, "ASUS", 0), /* nvidia */ + SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */ {} }; |