Revert "USB delay init quirk for logitech Harmony 700-series devices"

This reverts commit 631b2d37894bb2a891d8897e1861362a23dde4d9.

It was found to cause a number of USB devices to not work properly
because we call usb_disable_autosuspend too soon.  This is not an issue
with any other kernel version.

Reported-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Phil Dibowitz <phil@ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 91ddeba1339e30e0a781f15e816a56508fcaf82d..3e28f9216fada109820ab288a2e42feacde47a63 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -23,7 +23,6 @@
 #include <linux/mutex.h>
 #include <linux/freezer.h>
 #include <linux/pm_runtime.h>
-#include <linux/usb/quirks.h>
 
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
@@ -1791,6 +1790,7 @@ int usb_new_device(struct usb_device *udev)
        pm_runtime_set_active(&udev->dev);
        pm_runtime_enable(&udev->dev);
 
+       usb_detect_quirks(udev);
        err = usb_enumerate_device(udev);       /* Read descriptors */
        if (err < 0)
                goto fail;
@@ -3100,10 +3100,6 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
                if (status < 0)
                        goto loop;
 
-               usb_detect_quirks(udev);
-               if (udev->quirks & USB_QUIRK_DELAY_INIT)
-                       msleep(1000);
-
                /* consecutive bus-powered hubs aren't reliable; they can
                 * violate the voltage drop budget.  if the new child has
                 * a "powered" LED, users should notice we didn't enable it

diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index efa348212f4d954ac265c6dc2e14e3a9b1d699d8..df5dda7cfcc76a543a42fb3e35853a501084472a 100644 (file)
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -38,9 +38,6 @@ static const struct usb_device_id usb_quirk_list[] = {
        /* Creative SB Audigy 2 NX */
        { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
 
-       /* Logitech Harmony 700-series */
-       { USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
-
        /* Philips PSC805 audio device */
        { USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },
 

diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h
index 8052e000b4ef60108307252d1024c4eee943d672..0a555dd131fcdc24db1b8debe89f641fcc5b20bb 100644 (file)
--- a/include/linux/usb/quirks.h
+++ b/include/linux/usb/quirks.h
@@ -22,8 +22,4 @@
 /*device will morph if reset, don't use reset for handling errors */
 #define USB_QUIRK_RESET_MORPHS         0x00000010
 
-/* device needs a pause during initialization, after we read the device
-   descriptor */
-#define USB_QUIRK_DELAY_INIT           0x00000040
-
 #endif /* __LINUX_USB_QUIRKS_H */