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

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

@@ -197 +197 @@
 MODULE_DESCRIPTION("Aztech AZF3328 (PCI168)");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Aztech,AZF3328}}");
 
 #if IS_REACHABLE(CONFIG_GAMEPORT)
@@ -2380 +2379 @@
 
         /* 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"
@@ -2449 +2447 @@
                 /* shutdown codecs to reduce power / noise */
                         /* have ...ctrl_codec_activity() act properly */
-                codec->running = 1;
+                codec->running = true;
                 snd_azf3328_ctrl_codec_activity(chip, codec_type, 0);