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

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1x.c

@@ -35 +35 @@
 MODULE_DESCRIPTION("EMU10K1X");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Dell Creative Labs,SB Live!}");
 
 // module parameters (see "Module Parameters")
@@ -898 +897 @@
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
+
+        if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(28)) < 0) {
                 dev_err(card->dev, "error to set 28bit mask DMA\n");
                 pci_disable_device(pci);