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

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/cs46xx/cs46xx.c (modified) (1 diff)
• alsa-kernel/pci/cs46xx/cs46xx_lib.c (modified) (1 diff)

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

@@ -25 +25 @@
 MODULE_DESCRIPTION("Cirrus Logic Sound Fusion CS46XX");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Cirrus Logic,Sound Fusion (CS4280)},"
-                "{Cirrus Logic,Sound Fusion (CS4610)},"
-                "{Cirrus Logic,Sound Fusion (CS4612)},"
-                "{Cirrus Logic,Sound Fusion (CS4615)},"
-                "{Cirrus Logic,Sound Fusion (CS4622)},"
-                "{Cirrus Logic,Sound Fusion (CS4624)},"
-                "{Cirrus Logic,Sound Fusion (CS4630)}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */

GPL/trunk/alsa-kernel/pci/cs46xx/cs46xx_lib.c

@@ -818 +818 @@
         tmp1 -= correctionPerGOF * GOF_PER_SEC;
         correctionPerSec = tmp1;
-        initialDelay = ((48000 * 24) + rate - 1) / rate;
+        initialDelay = DIV_ROUND_UP(48000 * 24, rate);
 
         /*