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

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

@@ -87 +87 @@
 MODULE_DESCRIPTION("Avance Logic ALS300");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Avance Logic,ALS300},{Avance Logic,ALS300+}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
@@ -626 +625 @@
                 return err;
 
-        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, "error setting 28bit DMA mask\n");
                 pci_disable_device(pci);