From 8af52519b769daaff76ed2b27504b3143ff9b65c Mon Sep 17 00:00:00 2001 From: Abramo Bagnara Date: Wed, 26 Jul 2000 11:40:31 +0000 Subject: [PATCH] Added missing index match --- alsactl/merge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alsactl/merge.c b/alsactl/merge.c index 6a8487e..46d87f1 100644 --- a/alsactl/merge.c +++ b/alsactl/merge.c @@ -98,7 +98,8 @@ static int soundcard_setup_merge_control(struct ctl_control *cctl, struct ctl_co if (cctl1->c.id.iface == uctl->c.id.iface && cctl1->c.id.device == uctl->c.id.device && cctl1->c.id.subdevice == uctl->c.id.subdevice && - !strncmp(cctl1->c.id.name, uctl->c.id.name, sizeof(cctl1->c.id.name))) { + !strncmp(cctl1->c.id.name, uctl->c.id.name, sizeof(cctl1->c.id.name)) && + cctl1->c.id.index == uctl->c.id.index) { merge_one_control(cctl1, uctl, cardno); break; }