Changeset 772 for GPL/trunk/alsa-kernel/pci/fm801.c

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

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

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

@@ -1186 +1186 @@
 }
 
-
 static int snd_fm801_create(struct snd_card *card,
                             struct pci_dev *pci,
@@ -1195 +1194 @@
         int err;
 
-#ifndef TARGET_OS2
         err = pcim_enable_device(pci);
         if (err < 0)
                 return err;
-#else
-        if ((err = pci_enable_device(pci)) < 0)
-                return err;
-#endif
         spin_lock_init(&chip->reg_lock);
         chip->card = card;
@@ -1231 +1225 @@
 
         if ((chip->tea575x_tuner & TUNER_ONLY) == 0) {
-#ifndef TARGET_OS2
                 if (devm_request_irq(&pci->dev, pci->irq, snd_fm801_interrupt,
                                 IRQF_SHARED, KBUILD_MODNAME, chip)) {
-#else
-                if (request_irq(pci->irq, snd_fm801_interrupt, IRQF_SHARED,
-                                KBUILD_MODNAME, chip)) {
-#endif
                         dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
                         return -EBUSY;