USB: disable autosuspend by default for non-hubs

This patch (as965) disables autosuspend by default for all USB devices
other than hubs.  We are seeing too many devices that can't suspend or
resume properly, the blacklist is growing unreasonably quickly, and
this sort of thing should be handled in userspace.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 7f17d0fd76c00fa87a6c8967fac628515d5f0822..ebf3dc20110af96c4bdbcbac963c0d3c2a8ac313 100644 (file)
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -152,4 +152,10 @@ void usb_detect_quirks(struct usb_device *udev)
        /* do any special quirk handling here if needed */
        if (udev->quirks & USB_QUIRK_NO_AUTOSUSPEND)
                usb_autosuspend_quirk(udev);
+
+       /* By default, disable autosuspend for all non-hubs */
+#ifdef CONFIG_USB_SUSPEND
+       if (udev->descriptor.bDeviceClass != USB_CLASS_HUB)
+               udev->autosuspend_delay = -1;
+#endif
 }