Changeset 772 for GPL/trunk/alsa-kernel/pci/ens1370.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/ens1370.c (modified) (5 diffs)

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

@@ -9 +9 @@
  * for ens1371 only ( FIXME )
  * derived from cs4281.c, atiixp.c and via82xx.c
- * using http://www.alsa-project.org/~tiwai/writing-an-alsa-driver/ 
+ * using https://www.kernel.org/doc/html/latest/sound/kernel-api/writing-an-alsa-driver.html
  * by Kurt J. Bosch
  */
@@ -749 +749 @@
 
         mutex_lock(&ensoniq->src_mutex);
+#ifndef TARGET_OS2
         freq = DIV_ROUND_CLOSEST(rate << 15, 3000);
+#else
+        freq = ((rate << 15) + 1500) / 3000;
+#endif
         r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE |
                                                    ES_1371_DIS_P2 | ES_1371_DIS_R1)) |
@@ -770 +774 @@
 
         mutex_lock(&ensoniq->src_mutex);
+#ifndef TARGET_OS2
         freq = DIV_ROUND_CLOSEST(rate << 15, 3000);
+#else
+        freq = ((rate << 15) + 1500) / 3000;
+#endif
         r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE |
                                                    ES_1371_DIS_P1 | ES_1371_DIS_R1)) |
@@ -2035 +2043 @@
                 return err;
         ensoniq->port = pci_resource_start(pci, 0);
-#ifndef TARGET_OS2
         if (devm_request_irq(&pci->dev, pci->irq, snd_audiopci_interrupt,
                              IRQF_SHARED, KBUILD_MODNAME, ensoniq)) {
@@ -2041 +2048 @@
                 return -EBUSY;
         }
-#else
-        if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_SHARED,
-                        KBUILD_MODNAME, ensoniq)) {
-                dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
-                snd_ensoniq_free(card);
-                return -EBUSY;
-        }
-#endif
         ensoniq->irq = pci->irq;
         card->sync_irq = ensoniq->irq;