diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-10-28 06:24:23 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-29 14:11:44 -0500 |
commit | 75dab4710ba28b127cd5587b44ea5668fcde9a61 (patch) | |
tree | 200aee310ad25d2d9ffb28dc8b36bf8b0367ef1e | |
parent | d389d610b143d487e50fe898e0ee9d329c279a1b (diff) |
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>
-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 4394ae796356..0716ba691398 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, | |||
101 | usb_set_intfdata(intf, chips[i]); | 101 | usb_set_intfdata(intf, chips[i]); |
102 | mutex_unlock(®ister_mutex); | 102 | mutex_unlock(®ister_mutex); |
103 | return 0; | 103 | return 0; |
104 | } else if (regidx < 0) | 104 | } else if (!devices[i] && regidx < 0) |
105 | regidx = i; | 105 | regidx = i; |
106 | } | 106 | } |
107 | if (regidx < 0) { | 107 | if (regidx < 0) { |