Changeset 715 for GPL/branches/uniaud32-next/alsa-kernel/pci/cs4281.c

Timestamp:

Aug 7, 2022, 9:34:12 AM (3 years ago)

Author:

Paul Smedley

Message:

Code cleanups, fix trap on emu10k1

File:

• GPL/branches/uniaud32-next/alsa-kernel/pci/cs4281.c (modified) (2 diffs)

GPL/branches/uniaud32-next/alsa-kernel/pci/cs4281.c

@@ -1327 +1327 @@
         chip->ba0 = pcim_iomap_table(pci)[0];
         chip->ba1 = pcim_iomap_table(pci)[1];
+#else
+        chip->ba0 = pci_ioremap_bar(pci, 0);
+        chip->ba1 = pci_ioremap_bar(pci, 1);
+#endif
         if (devm_request_irq(&pci->dev, pci->irq, snd_cs4281_interrupt,
                              IRQF_SHARED, KBUILD_MODNAME, chip)) {
@@ -1332 +1336 @@
                 return -ENOMEM;
         }
-#else
-        chip->ba0 = pci_ioremap_bar(pci, 0);
-        chip->ba1 = pci_ioremap_bar(pci, 1);
-        if (request_irq(pci->irq, snd_cs4281_interrupt, IRQF_SHARED,
-                        KBUILD_MODNAME, chip)) {
-                dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                snd_cs4281_free(chip);
-                return -ENOMEM;
-        }
-#endif  
         chip->irq = pci->irq;
         card->sync_irq = chip->irq;