diff options
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/usbaudio.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 4589c637a25e..fce6ad62df6c 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
@@ -3212,7 +3212,6 @@ static void *snd_usb_audio_probe(struct usb_device *dev, | |||
3212 | struct usb_interface *intf, | 3212 | struct usb_interface *intf, |
3213 | const struct usb_device_id *usb_id) | 3213 | const struct usb_device_id *usb_id) |
3214 | { | 3214 | { |
3215 | struct usb_host_config *config = dev->actconfig; | ||
3216 | const snd_usb_audio_quirk_t *quirk = (const snd_usb_audio_quirk_t *)usb_id->driver_info; | 3215 | const snd_usb_audio_quirk_t *quirk = (const snd_usb_audio_quirk_t *)usb_id->driver_info; |
3217 | int i, err; | 3216 | int i, err; |
3218 | snd_usb_audio_t *chip; | 3217 | snd_usb_audio_t *chip; |
@@ -3233,7 +3232,6 @@ static void *snd_usb_audio_probe(struct usb_device *dev, | |||
3233 | if (id == USB_ID(0x041e, 0x3000)) { | 3232 | if (id == USB_ID(0x041e, 0x3000)) { |
3234 | if (snd_usb_extigy_boot_quirk(dev, intf) < 0) | 3233 | if (snd_usb_extigy_boot_quirk(dev, intf) < 0) |
3235 | goto __err_val; | 3234 | goto __err_val; |
3236 | config = dev->actconfig; | ||
3237 | } | 3235 | } |
3238 | /* SB Audigy 2 NX needs its own boot-up magic, too */ | 3236 | /* SB Audigy 2 NX needs its own boot-up magic, too */ |
3239 | if (id == USB_ID(0x041e, 0x3020)) { | 3237 | if (id == USB_ID(0x041e, 0x3020)) { |
@@ -3262,11 +3260,6 @@ static void *snd_usb_audio_probe(struct usb_device *dev, | |||
3262 | /* it's a fresh one. | 3260 | /* it's a fresh one. |
3263 | * now look for an empty slot and create a new card instance | 3261 | * now look for an empty slot and create a new card instance |
3264 | */ | 3262 | */ |
3265 | /* first, set the current configuration for this device */ | ||
3266 | if (usb_reset_configuration(dev) < 0) { | ||
3267 | snd_printk(KERN_ERR "cannot reset configuration (value 0x%x)\n", get_cfg_desc(config)->bConfigurationValue); | ||
3268 | goto __error; | ||
3269 | } | ||
3270 | for (i = 0; i < SNDRV_CARDS; i++) | 3263 | for (i = 0; i < SNDRV_CARDS; i++) |
3271 | if (enable[i] && ! usb_chip[i] && | 3264 | if (enable[i] && ! usb_chip[i] && |
3272 | (vid[i] == -1 || vid[i] == USB_ID_VENDOR(id)) && | 3265 | (vid[i] == -1 || vid[i] == USB_ID_VENDOR(id)) && |