Skip to content

Commit

Permalink
Revert "USB delay init quirk for logitech Harmony 700-series devices"
Browse files Browse the repository at this point in the history
This reverts commit 631b2d3.

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>
  • Loading branch information
Greg Kroah-Hartman committed Sep 13, 2010
1 parent df50751 commit bcdc83e
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
6 changes: 1 addition & 5 deletions drivers/usb/core/hub.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions drivers/usb/core/quirks.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 },

Expand Down
4 changes: 0 additions & 4 deletions include/linux/usb/quirks.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit bcdc83e

Please sign in to comment.