diff options
Diffstat (limited to 'drivers/usb/core/config.c')
-rw-r--r-- | drivers/usb/core/config.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c index a6b2cabe7930..548d1996590f 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c | |||
@@ -651,10 +651,6 @@ void usb_destroy_configuration(struct usb_device *dev) | |||
651 | * | 651 | * |
652 | * hub-only!! ... and only in reset path, or usb_new_device() | 652 | * hub-only!! ... and only in reset path, or usb_new_device() |
653 | * (used by real hubs and virtual root hubs) | 653 | * (used by real hubs and virtual root hubs) |
654 | * | ||
655 | * NOTE: if this is a WUSB device and is not authorized, we skip the | ||
656 | * whole thing. A non-authorized USB device has no | ||
657 | * configurations. | ||
658 | */ | 654 | */ |
659 | int usb_get_configuration(struct usb_device *dev) | 655 | int usb_get_configuration(struct usb_device *dev) |
660 | { | 656 | { |
@@ -666,8 +662,6 @@ int usb_get_configuration(struct usb_device *dev) | |||
666 | struct usb_config_descriptor *desc; | 662 | struct usb_config_descriptor *desc; |
667 | 663 | ||
668 | cfgno = 0; | 664 | cfgno = 0; |
669 | if (dev->authorized == 0) /* Not really an error */ | ||
670 | goto out_not_authorized; | ||
671 | result = -ENOMEM; | 665 | result = -ENOMEM; |
672 | if (ncfg > USB_MAXCONFIG) { | 666 | if (ncfg > USB_MAXCONFIG) { |
673 | dev_warn(ddev, "too many configurations: %d, " | 667 | dev_warn(ddev, "too many configurations: %d, " |
@@ -751,7 +745,6 @@ int usb_get_configuration(struct usb_device *dev) | |||
751 | 745 | ||
752 | err: | 746 | err: |
753 | kfree(desc); | 747 | kfree(desc); |
754 | out_not_authorized: | ||
755 | dev->descriptor.bNumConfigurations = cfgno; | 748 | dev->descriptor.bNumConfigurations = cfgno; |
756 | err2: | 749 | err2: |
757 | if (result == -ENOMEM) | 750 | if (result == -ENOMEM) |