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

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

@@ -44 +44 @@
 MODULE_DESCRIPTION("Analog Devices AD1889 ALSA sound driver");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Analog Devices,AD1889}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
@@ -858 +857 @@
 
         /* check PCI availability (32bit DMA) */
-        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0 ||
-            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) {
+        if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(32))) {
                 dev_err(card->dev, "error setting 32-bit DMA mask.\n");
                 pci_disable_device(pci);