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

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

@@ -56 +56 @@
 #ifdef CHIP1370
 MODULE_DESCRIPTION("Ensoniq AudioPCI ES1370");
-MODULE_SUPPORTED_DEVICE("{{Ensoniq,AudioPCI-97 ES1370},"
-                "{Creative Labs,SB PCI64/128 (ES1370)}}");
 #endif
 #ifdef CHIP1371
 MODULE_DESCRIPTION("Ensoniq/Creative AudioPCI ES1371+");
-MODULE_SUPPORTED_DEVICE("{{Ensoniq,AudioPCI ES1371/73},"
-                "{Ensoniq,AudioPCI ES1373},"
-                "{Creative Labs,Ectiva EV1938},"
-                "{Creative Labs,SB PCI64/128 (ES1371/73)},"
-                "{Creative Labs,Vibra PCI128},"
-                "{Ectiva,EV1938}}");
 #endif
 
@@ -756 +748 @@
 
         mutex_lock(&ensoniq->src_mutex);
-        freq = ((rate << 15) + 1500) / 3000;
+        freq = DIV_ROUND_CLOSEST(rate << 15, 3000);
         r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE |
                                                    ES_1371_DIS_P2 | ES_1371_DIS_R1)) |
@@ -777 +769 @@
 
         mutex_lock(&ensoniq->src_mutex);
-        freq = ((rate << 15) + 1500) / 3000;
+        freq = DIV_ROUND_CLOSEST(rate << 15, 3000);
         r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE |
                                                    ES_1371_DIS_P1 | ES_1371_DIS_R1)) |