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

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

@@ -111 +111 @@
 MODULE_DESCRIPTION("ESS Maestro");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{ESS,Maestro 2e},"
-                "{ESS,Maestro 2},"
-                "{ESS,Maestro 1},"
-                "{TerraTec,DMX}}");
 
 #if IS_REACHABLE(CONFIG_GAMEPORT)
@@ -2705 +2701 @@
                 return err;
         /* 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");
@@ -2805 +2800 @@
                         dev_info(card->dev, "detected TEA575x radio type %s\n",
                                    get_tea575x_gpio(chip)->name);
-                        strlcpy(chip->tea.card, get_tea575x_gpio(chip)->name,
+                        strscpy(chip->tea.card, get_tea575x_gpio(chip)->name,
                                 sizeof(chip->tea.card));
                         break;