Changeset 695 for GPL/trunk/alsa-kernel/pci/es1938.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/es1938.c (modified) (2 diffs)

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

@@ -56 +56 @@
 MODULE_DESCRIPTION("ESS Solo-1");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{ESS,ES1938},"
-                "{ESS,ES1946},"
-                "{ESS,ES1969},"
-                "{TerraTec,128i PCI}}");
 
 #if IS_REACHABLE(CONFIG_GAMEPORT)
@@ -1596 +1592 @@
                 return err;
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(24)) < 0 ||
-            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(24)) < 0) {
+        if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(24))) {
                 dev_err(card->dev,
                         "architecture does not support 24bit PCI busmaster DMA\n");