On 07/21/2010 11:09 PM, Alan Stern wrote: > Yes, that's a problem. We should be able to fix it, though, by moving > the call to usb_detect_quirks from usb_new_device up into > hub_port_connect_change, between hub_port_init and the new test. > > Stephen, can you make that change and test it? That works too. New patch attached. -- Phil Dibowitz phil@xxxxxxxx Open Source software and tech docs Insanity Palace of Metallica http://www.phildev.net/ http://www.ipom.com/ "Be who you are and say what you feel, because those who mind don't matter and those who matter don't mind." - Dr. Seuss
The Logitech Harmony 700 series needs an extra delay during initialization.
This patch adds a USB quirk which enables such a delay and adds the device to
the quirks list.
Signed-off-by: Phil Dibowitz <phil@xxxxxxxx>
---
linux-2.6.35-rc5-phil/drivers/usb/core/hub.c | 6 +++++-
linux-2.6.35-rc5-phil/drivers/usb/core/quirks.c | 3 +++
linux-2.6.35-rc5-phil/include/linux/usb/quirks.h | 4 ++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff -puN drivers/usb/core/quirks.c~usbcore-delayinit-quirk drivers/usb/core/quirks.c
--- linux-2.6.35-rc5/drivers/usb/core/quirks.c~usbcore-delayinit-quirk 2010-07-21 23:19:49.000000000 +0200
+++ linux-2.6.35-rc5-phil/drivers/usb/core/quirks.c 2010-07-21 23:19:49.000000000 +0200
@@ -38,6 +38,9 @@ static const struct usb_device_id usb_qu
/* 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 -puN drivers/usb/core/hub.c~usbcore-delayinit-quirk drivers/usb/core/hub.c
--- linux-2.6.35-rc5/drivers/usb/core/hub.c~usbcore-delayinit-quirk 2010-07-21 23:19:49.000000000 +0200
+++ linux-2.6.35-rc5-phil/drivers/usb/core/hub.c 2010-07-21 23:19:49.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/usb.h>
#include <linux/usbdevice_fs.h>
#include <linux/usb/hcd.h>
+#include <linux/usb/quirks.h>
#include <linux/kthread.h>
#include <linux/mutex.h>
#include <linux/freezer.h>
@@ -1801,7 +1802,6 @@ int usb_new_device(struct usb_device *ud
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;
@@ -3109,6 +3109,10 @@ static void hub_port_connect_change(stru
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 -puN include/linux/usb/quirks.h~usbcore-delayinit-quirk include/linux/usb/quirks.h
--- linux-2.6.35-rc5/include/linux/usb/quirks.h~usbcore-delayinit-quirk 2010-07-21 23:19:49.000000000 +0200
+++ linux-2.6.35-rc5-phil/include/linux/usb/quirks.h 2010-07-21 23:19:49.000000000 +0200
@@ -26,4 +26,8 @@
and can't handle talking to these interfaces */
#define USB_QUIRK_HONOR_BNUMINTERFACES 0x00000020
+/* device needs a pause during initialization, after we read the device
+ descriptor */
+#define USB_QUIRK_DELAY_INIT 0x00000040
+
#endif /* __LINUX_USB_QUIRKS_H */
_
Attachment:
signature.asc
Description: OpenPGP digital signature
