summaryrefslogtreecommitdiff
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2015-02-08 22:39:44 +0900
committerBen Hutchings <ben@decadent.org.uk>2019-02-11 17:54:11 +0000
commitf65e34ab74adf38b61cd11c6ba73858cf52501d9 (patch)
tree125f3b99027bec5ca8ae1285a6a8e1ccc4253f3e /sound/core
parent7580cfd377e2929cc344d5c785fc2baef32c8573 (diff)
ALSA: control: fix failure to return numerical ID in 'add' event
commit d34890cf4113397625a6629d71749fa638a7a734 upstream. Currently when adding a new control, the assigned numerical ID is not set for event data, thus userspace applications cannot realize it just by event data. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/control.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/control.c b/sound/core/control.c
index fdffe37d40b8..d63180ebd4de 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -368,6 +368,7 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)
card->controls_count += kcontrol->count;
kcontrol->id.numid = card->last_numid + 1;
card->last_numid += kcontrol->count;
+ id = kcontrol->id;
count = kcontrol->count;
up_write(&card->controls_rwsem);
for (idx = 0; idx < count; idx++, id.index++, id.numid++)