projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sound-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[linux-2.6-microblaze.git]
/
sound
/
drivers
/
aloop.c
diff --git
a/sound/drivers/aloop.c
b/sound/drivers/aloop.c
index
5263718
..
80b814b
100644
(file)
--- a/
sound/drivers/aloop.c
+++ b/
sound/drivers/aloop.c
@@
-1571,6
+1571,14
@@
static int loopback_mixer_new(struct loopback *loopback, int notify)
return -ENOMEM;
kctl->id.device = dev;
kctl->id.subdevice = substr;
return -ENOMEM;
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:
setup->active_id = kctl->id;
switch (idx) {
case ACTIVE_IDX:
setup->active_id = kctl->id;
@@
-1587,9
+1595,6
@@
static int loopback_mixer_new(struct loopback *loopback, int notify)
default:
break;
}
default:
break;
}
- err = snd_ctl_add(card, kctl);
- if (err < 0)
- return err;
}
}
}
}
}
}