OSDN Git Service

Added missing index match
authorAbramo Bagnara <abramo@alsa-project.org>
Wed, 26 Jul 2000 11:40:31 +0000 (11:40 +0000)
committerAbramo Bagnara <abramo@alsa-project.org>
Wed, 26 Jul 2000 11:40:31 +0000 (11:40 +0000)
alsactl/merge.c

index 6a8487e..46d87f1 100644 (file)
@@ -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;
                        }