Changeset 689 for GPL/trunk/alsa-kernel/drivers/aloop.c

Timestamp:

Jul 24, 2021, 3:42:01 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge in changes from uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/drivers/aloop.c (modified) (2 diffs)

GPL/trunk/alsa-kernel/drivers/aloop.c

@@ -1573 +1573 @@
                                 kctl->id.device = dev;
                                 kctl->id.subdevice = substr;
+
+                                /* Add the control before copying the id so that
+                                 * the numid field of the id is set in the copy.
+                                 */
+                                err = snd_ctl_add(card, kctl);
+                                if (err < 0)
+                                        return err;
+
                                 switch (idx) {
                                 case ACTIVE_IDX:
@@ -1589 +1597 @@
                                         break;
                                 }
-                                err = snd_ctl_add(card, kctl);
-                                if (err < 0)
-                                        return err;
                         }
                 }