Changeset 598 for GPL/trunk/alsa-kernel/pci/atiixp.c

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/atiixp.c (modified) (4 diffs)

GPL/trunk/alsa-kernel/pci/atiixp.c

@@ -61 +61 @@
 
 /* just for backward compatibility */
-static int enable;
+//static int enable;
 module_param(enable, bool, 0444);
 
@@ -287 +287 @@
 /*
  */
-static struct pci_device_id snd_atiixp_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_atiixp_ids) = {
         { PCI_VDEVICE(ATI, 0x4341), 0 }, /* SB200 */
         { PCI_VDEVICE(ATI, 0x4361), 0 }, /* SB300 */
@@ -298 +298 @@
 
 static struct snd_pci_quirk atiixp_quirks[] __devinitdata = {
+        SND_PCI_QUIRK(0x105b, 0x0c81, "Foxconn RC4107MA-RS2", 0),
         SND_PCI_QUIRK(0x15bd, 0x3100, "DFI RS482", 0),
         {0} /* terminator */
@@ -374 +375 @@
         }
 
-        if (dma->periods == periods && dma->period_bytes == period_bytes) {
+        if (dma->periods == periods && dma->period_bytes == period_bytes) {
                 writel((u32)dma->desc_buf.addr | ATI_REG_LINKPTR_EN,
                         (char*)chip->remap_addr + dma->ops->llp_offset);