Changeset 715 for GPL/branches/uniaud32-next/alsa-kernel/pci/atiixp.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/atiixp.c (modified) (2 diffs)

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

@@ -1578 +1578 @@
 #ifndef TARGET_OS2
         chip->remap_addr = pcim_iomap_table(pci)[0];
+#else
+        chip->remap_addr = pci_ioremap_bar(pci, 0);
+#endif
         if (devm_request_irq(&pci->dev, pci->irq, snd_atiixp_interrupt,
                              IRQF_SHARED, KBUILD_MODNAME, chip)) {
@@ -1583 +1586 @@
                 return -EBUSY;
         }
-#else
-        chip->remap_addr = pci_ioremap_bar(pci, 0);
-        if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED,
-                        KBUILD_MODNAME, chip)) {
-                dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                snd_atiixp_free(chip);
-                return -EBUSY;
-        }
-#endif
         chip->irq = pci->irq;
         card->sync_irq = chip->irq;