Changeset 695 for GPL/trunk/alsa-kernel/pci/cs5535audio

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/cs5535audio/cs5535audio.c (modified) (2 diffs)
• alsa-kernel/pci/cs5535audio/cs5535audio_olpc.c (modified) (2 diffs)

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

@@ -274 +274 @@
                 return err;
 
-        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_warn(card->dev, "unable to get 32bit dma\n");
                 err = -ENXIO;
@@ -399 +398 @@
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("CS5535 Audio");
-MODULE_SUPPORTED_DEVICE("CS5535 Audio");

GPL/trunk/alsa-kernel/pci/cs5535audio/cs5535audio_olpc.c

@@ -159 +159 @@
         memset(&elem, 0, sizeof(elem));
         elem.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-        strlcpy(elem.name, "High Pass Filter Enable", sizeof(elem.name));
+        strscpy(elem.name, "High Pass Filter Enable", sizeof(elem.name));
         snd_ctl_remove_id(card, &elem);
 
@@ -165 +165 @@
         memset(&elem, 0, sizeof(elem));
         elem.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-        strlcpy(elem.name, "V_REFOUT Enable", sizeof(elem.name));
+        strscpy(elem.name, "V_REFOUT Enable", sizeof(elem.name));
         snd_ctl_remove_id(card, &elem);