Changeset 695 for GPL/trunk/alsa-kernel/drivers/opl3

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/drivers/opl3/opl3_oss.c (modified) (1 diff)
• alsa-kernel/drivers/opl3/opl3_synth.c (modified) (1 diff)

GPL/trunk/alsa-kernel/drivers/opl3/opl3_oss.c

@@ -98 +98 @@
 
         opl3->oss_seq_dev = dev;
-        strlcpy(dev->name, name, sizeof(dev->name));
+        strscpy(dev->name, name, sizeof(dev->name));
         arg = SNDRV_SEQ_DEVICE_ARGPTR(dev);
         arg->type = SYNTH_TYPE_FM;

GPL/trunk/alsa-kernel/drivers/opl3/opl3_synth.c

@@ -291 +291 @@
 
         if (name)
-                strlcpy(patch->name, name, sizeof(patch->name));
+                strscpy(patch->name, name, sizeof(patch->name));
 
         return 0;