summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-11-07 14:12:34 +0100
committerTakashi Iwai <tiwai@suse.de>2014-11-07 14:25:07 +0100
commit31584ed18c073176a7ad96ddbfd09765e21e813d (patch)
tree2ca3aa3a7d7762be55a3139a5e79eefc33e68be3
parentALSA: usb-audio: Trigger PCM XRUN at XRUN (diff)
downloadlinux-31584ed18c073176a7ad96ddbfd09765e21e813d.tar.xz
linux-31584ed18c073176a7ad96ddbfd09765e21e813d.zip
ALSA: snd_ctl_activate_id(): Fix index look-up
We want to know the offset for the id that was passed to the function, not the offset of the first id of the control (which is always 0). Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/core/control.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/control.c b/sound/core/control.c
index 99aa3aa157ba..bb96a467e88d 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -572,7 +572,7 @@ int snd_ctl_activate_id(struct snd_card *card, struct snd_ctl_elem_id *id,
ret = -ENOENT;
goto unlock;
}
- index_offset = snd_ctl_get_ioff(kctl, &kctl->id);
+ index_offset = snd_ctl_get_ioff(kctl, id);
vd = &kctl->vd[index_offset];
ret = 0;
if (active) {