diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-28 11:24:23 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-01-03 04:33:15 +0000 |
| commit | e9985b96e1505dda3207b8addac47c3a45a8e776 (patch) | |
| tree | 9a8334ddb3358b58715dfc394c0d2f5a598f854a /sound/usb | |
| parent | a499dd1760871482373c47bb5fe089311cc953fb (diff) | |
| download | kernel_samsung_smdk4412-e9985b96e1505dda3207b8addac47c3a45a8e776.zip kernel_samsung_smdk4412-e9985b96e1505dda3207b8addac47c3a45a8e776.tar.gz kernel_samsung_smdk4412-e9985b96e1505dda3207b8addac47c3a45a8e776.tar.bz2 | |
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: Ben Hutchings <ben@decadent.org.uk>
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 c7dca7b..46a2816 100644 --- a/sound/usb/6fire/chip.c +++ b/sound/usb/6fire/chip.c @@ -102,7 +102,7 @@ static int __devinit 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) { |