diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-28 10:24:23 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-29 19:27:58 (GMT) |
| commit | baf1abbaada81be48054b523f9c5286b9f4ae865 (patch) | |
| tree | af5579e92d7daf4ac05aed96b6b4f0b236581877 /sound/usb | |
| parent | 9d4dd888b4b5799ecadfb0d8c9adda7a76779806 (diff) | |
| download | linux-fsl-qoriq-baf1abbaada81be48054b523f9c5286b9f4ae865.tar.xz | |
ALSA: 6fire: Fix probe of multiple cards
commit 9b389a8a022110b4bc055a19b888283544d9eba6 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: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/6fire/chip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/6fire/chip.c b/sound/usb/6fire/chip.c index c39c779..66edc4a 100644 --- a/sound/usb/6fire/chip.c +++ b/sound/usb/6fire/chip.c @@ -101,7 +101,7 @@ static int usb6fire_chip_probe(struct usb_interface *intf, usb_set_intfdata(intf, chips[i]); mutex_unlock(®ister_mutex); return 0; - } else if (regidx < 0) + } else if (!devices[i] && regidx < 0) regidx = i; } if (regidx < 0) { |