On Sun, Jul 18, 2010 at 12:00:41PM -0400, Alan Stern wrote:
> On Sun, 18 Jul 2010, Phil Dibowitz wrote:
>
> > Alan - this is the first quirk I've added outside of usb-storage... did I
> > miss anything? All I really did here was a compile test.
>
> It would be a little easier to review if your patch was inline instead
> of an attachment. Nevertheless...
::switches to mutt::
Inline this time. I think this addresses all your points.
- Phil
The Logitech Harmony 700 series needs a an extra delay during initialization.
This adds a USB quirk which enabled such a delay, and adds the device to the
quirks list.
---
linux-2.6.35-rc5-phil/drivers/usb/core/hub.c | 5 +++++
linux-2.6.35-rc5-phil/drivers/usb/core/quirks.c | 3 +++
linux-2.6.35-rc5-phil/include/linux/usb/quirks.h | 3 +++
3 files changed, 11 insertions(+)
diff -puN drivers/usb/core/quirks.c~usbcore-checkspeed-quirk drivers/usb/core/quirks.c
--- linux-2.6.35-rc5/drivers/usb/core/quirks.c~usbcore-checkspeed-quirk 2010-07-18 16:00:15.000000000 +0200
+++ linux-2.6.35-rc5-phil/drivers/usb/core/quirks.c 2010-07-18 18:28:08.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-checkspeed-quirk drivers/usb/core/hub.c
--- linux-2.6.35-rc5/drivers/usb/core/hub.c~usbcore-checkspeed-quirk 2010-07-18 16:00:15.000000000 +0200
+++ linux-2.6.35-rc5-phil/drivers/usb/core/hub.c 2010-07-18 18:29:28.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>
@@ -3109,6 +3110,10 @@ static void hub_port_connect_change(stru
if (status < 0)
goto loop;
+ 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-checkspeed-quirk include/linux/usb/quirks.h
--- linux-2.6.35-rc5/include/linux/usb/quirks.h~usbcore-checkspeed-quirk 2010-07-18 16:00:15.000000000 +0200
+++ linux-2.6.35-rc5-phil/include/linux/usb/quirks.h 2010-07-18 18:27:46.000000000 +0200
@@ -26,4 +26,7 @@
and can't handle talking to these interfaces */
#define USB_QUIRK_HONOR_BNUMINTERFACES 0x00000020
+/* device needs a pause before checking speed */
+#define USB_QUIRK_DELAY_INIT 0x00000040
+
#endif /* __LINUX_USB_QUIRKS_H */
_
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
