Changeset 695 for GPL/trunk/alsa-kernel/pci/maestro3.c

Timestamp:

Aug 21, 2021, 3:35:34 AM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

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

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

@@ -43 +43 @@
 MODULE_DESCRIPTION("ESS Maestro3 PCI");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{ESS,Maestro3 PCI},"
-                "{ESS,ES1988},"
-                "{ESS,Allegro PCI},"
-                "{ESS,Allegro-1 PCI},"
-                "{ESS,Canyon3D-2/LE PCI}}");
 MODULE_FIRMWARE("ess/maestro3_assp_kernel.fw");
 MODULE_FIRMWARE("ess/maestro3_assp_minisrc.fw");
@@ -1253 +1248 @@
 
         /* set up dac/adc rate */
+#ifndef TARGET_OS2
+        freq = DIV_ROUND_CLOSEST(runtime->rate << 15, 48000);
+#else
         freq = ((runtime->rate << 15) + 24000 ) / 48000;
+#endif
         if (freq) 
                 freq--;
@@ -2540 +2539 @@
 
         /* check, if we can restrict PCI DMA transfers to 28 bits */
-        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(28)) < 0 ||
-            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(28)) < 0) {
+        if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(28))) {
                 dev_err(card->dev,
                         "architecture does not support 28bit PCI busmaster DMA\n");