ALSA: 6fire: Fix probe of multiple cards
authorTakashi Iwai <tiwai@suse.de>
Mon, 28 Oct 2013 10:24:23 +0000 (11:24 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 29 Oct 2013 10:37:11 +0000 (11:37 +0100)
The probe code of snd-usb-6fire driver overrides the devices[] pointer
wrongly without checking whether it's already occupied or not.  This
would screw up the device disconnection later.

Spotted by coverity CID 141423.

Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/6fire/chip.c

index c39c77978468b9270fd117d6d055ecc2e021fdb3..66edc4a7917f9bd08604f85ed98bc988d8e5d9f3 100644 (file)
@@ -101,7 +101,7 @@ static int usb6fire_chip_probe(struct usb_interface *intf,
                        usb_set_intfdata(intf, chips[i]);
                        mutex_unlock(&register_mutex);
                        return 0;
-               } else if (regidx < 0)
+               } else if (!devices[i] && regidx < 0)
                        regidx = i;
        }
        if (regidx < 0) {