Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[firefly-linux-kernel-4.4.55.git] / drivers / usb / core / quirks.c

diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 25719da45e338ee932c899a3df45c4667e6efeb1..44c595432d6fec7eff59fadccd0da497244bb17e 100644 (file)
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -117,21 +117,6 @@ void usb_detect_quirks(struct usb_device *udev)
                dev_dbg(&udev->dev, "USB quirks for this device: %x\n",
                                udev->quirks);
 
-#ifdef CONFIG_USB_SUSPEND
-
-       /* By default, disable autosuspend for all devices.  The hub driver
-        * will enable it for hubs.
-        */
-       usb_disable_autosuspend(udev);
-
-       /* Autosuspend can also be disabled if the initial autosuspend_delay
-        * is negative.
-        */
-       if (udev->autosuspend_delay < 0)
-               usb_autoresume_device(udev);
-
-#endif
-
        /* For the present, all devices default to USB-PERSIST enabled */
 #if 0          /* was: #ifdef CONFIG_PM */
        /* Hubs are automatically enabled for USB-PERSIST */