Commit 5d7ee529 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman

[PATCH] USB: remove unnecessary setting of configuration from audio

audio should not mess with configurations.
parent 071b11b2
...@@ -99,6 +99,8 @@ ...@@ -99,6 +99,8 @@
* for abs. Bug report by Andrew Morton <andrewm@uow.edu.au> * for abs. Bug report by Andrew Morton <andrewm@uow.edu.au>
* 2001-06-16: Bryce Nesbitt <bryce@obviously.com> * 2001-06-16: Bryce Nesbitt <bryce@obviously.com>
* Fix SNDCTL_DSP_STEREO API violation * Fix SNDCTL_DSP_STEREO API violation
* 2003-04-08: Oliver Neukum (oliver@neukum.name):
* Setting a configuration is done by usbcore and must not be overridden
*/ */
/* /*
...@@ -3790,10 +3792,6 @@ static int usb_audio_probe(struct usb_interface *intf, ...@@ -3790,10 +3792,6 @@ static int usb_audio_probe(struct usb_interface *intf,
*/ */
i = dev->actconfig - config; i = dev->actconfig - config;
if (usb_set_configuration(dev, config->desc.bConfigurationValue) < 0) {
printk(KERN_ERR "usbaudio: set_configuration failed (ConfigValue 0x%x)\n", config->desc.bConfigurationValue);
return -EIO;
}
ret = usb_get_descriptor(dev, USB_DT_CONFIG, i, buf, 8); ret = usb_get_descriptor(dev, USB_DT_CONFIG, i, buf, 8);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "usbaudio: cannot get first 8 bytes of config descriptor %d of device %d (error %d)\n", i, dev->devnum, ret); printk(KERN_ERR "usbaudio: cannot get first 8 bytes of config descriptor %d of device %d (error %d)\n", i, dev->devnum, ret);
......
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