tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'fix/hda' into topic/hda

Takashi Iwai 7484399f d2db09b8

+4 -7
unified split
+4 -7
sound/pci/hda/hda_intel.c
··· 1897 1898 if (!bdl_pos_adj[chip->dev_index]) 1899 return 1; /* no delayed ack */ 1900 - if (azx_dev->period_bytes == 0) { 1901 - printk(KERN_WARNING 1902 - "hda-intel: Divide by zero was avoided " 1903 - "in azx_dev->period_bytes.\n"); 1904 - return 0; 1905 - } 1906 if (pos % azx_dev->period_bytes > azx_dev->period_bytes / 2) 1907 return 0; /* NG - it's below the period boundary */ 1908 return 1; /* OK, it's fine */ ··· 2357 */ 2358 static struct snd_pci_quirk msi_black_list[] __devinitdata = { 2359 SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ 2360 - SND_PCI_QUIRK(0x1043, 0x829c, "ASUS", 0), /* nvidia */ 2361 {} 2362 }; 2363
··· 1897 1898 if (!bdl_pos_adj[chip->dev_index]) 1899 return 1; /* no delayed ack */ 1900 + if (WARN_ONCE(!azx_dev->period_bytes, 1901 + "hda-intel: zero azx_dev->period_bytes")) 1902 + return 0; /* this shouldn't happen! */ 1903 if (pos % azx_dev->period_bytes > azx_dev->period_bytes / 2) 1904 return 0; /* NG - it's below the period boundary */ 1905 return 1; /* OK, it's fine */ ··· 2360 */ 2361 static struct snd_pci_quirk msi_black_list[] __devinitdata = { 2362 SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ 2363 + SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */ 2364 {} 2365 }; 2366