summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2015-02-08 22:39:44 +0900
committerTakashi Iwai <tiwai@suse.de>2015-02-08 15:31:09 +0100
commitd34890cf4113397625a6629d71749fa638a7a734 (patch)
treeacce8f4357e7e20de216e3b00b1810bd190bbca4
parent12865cac38cc9e808ce8b479f4bb12fd00bfee7c (diff)
downloadop-kernel-dev-d34890cf4113397625a6629d71749fa638a7a734.zip
op-kernel-dev-d34890cf4113397625a6629d71749fa638a7a734.tar.gz
ALSA: control: fix failure to return numerical ID in 'add' event
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>
-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 60caba1..8aae6ea 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -373,6 +373,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++)
OpenPOWER on IntegriCloud