Commit 1b443352 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman

ALSA: 6fire: Fix probe of multiple cards

commit 9b389a8a upstream.

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.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c0d30628
...@@ -101,7 +101,7 @@ static int __devinit usb6fire_chip_probe(struct usb_interface *intf, ...@@ -101,7 +101,7 @@ static int __devinit usb6fire_chip_probe(struct usb_interface *intf,
usb_set_intfdata(intf, chips[i]); usb_set_intfdata(intf, chips[i]);
mutex_unlock(&register_mutex); mutex_unlock(&register_mutex);
return 0; return 0;
} else if (regidx < 0) } else if (!devices[i] && regidx < 0)
regidx = i; regidx = i;
} }
if (regidx < 0) { if (regidx < 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment