Changeset 772 for GPL/trunk/alsa-kernel/pci/bt87x.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/bt87x.c (modified) (1 diff)

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

@@ -706 +706 @@
         spin_lock_init(&chip->reg_lock);
 
-#ifndef TARGET_OS2
         err = pcim_iomap_regions(pci, 1 << 0, "Bt87x audio");
         if (err < 0)
                 return err;
         chip->mmio = pcim_iomap_table(pci)[0];
-#else
-        err = pci_request_regions(pci, "Bt87x audio");
-        if (err < 0) {
-                kfree(chip);
-                pci_disable_device(pci);
-                return err;
-        }
-        chip->mmio = pci_ioremap_bar(pci, 0);
-#endif
         chip->reg_control = CTL_A_PWRDN | CTL_DA_ES2 |
                             CTL_PKTP_16 | (15 << CTL_DA_SDR_SHIFT);