Changeset 695 for GPL/trunk/alsa-kernel/pci/intel8x0m.c

Timestamp:

Aug 21, 2021, 3:35:34 AM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/intel8x0m.c (modified) (3 diffs)

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

@@ -26 +26 @@
                    "SiS 7013; NVidia MCP/2/2S/3 modems");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Intel,82801AA-ICH},"
-                "{Intel,82901AB-ICH0},"
-                "{Intel,82801BA-ICH2},"
-                "{Intel,82801CA-ICH3},"
-                "{Intel,82801DB-ICH4},"
-                "{Intel,ICH5},"
-                "{Intel,ICH6},"
-                "{Intel,ICH7},"
-                "{Intel,MX440},"
-                "{SiS,7013},"
-                "{NVidia,NForce Modem},"
-                "{NVidia,NForce2 Modem},"
-                "{NVidia,NForce2s Modem},"
-                "{NVidia,NForce3 Modem},"
-                "{AMD,AMD768}}");
 
 static int index = -2; /* Exclude the first card */
@@ -1130 +1115 @@
         else
                 chip->bmaddr = pci_iomap(pci, 1, 0);
+
+port_inited:
         if (!chip->bmaddr) {
                 dev_err(card->dev, "Controller space ioremap problem\n");
@@ -1136 +1123 @@
         }
 
- port_inited:
         /* initialize offsets */
         chip->bdbars_count = 2;