On 06/23/2010 07:47 PM, Phil Dibowitz wrote: > My schedule frees up in about 3 weeks, and I can take it then, if you want. > Feel free to put something the concordance tracker and assign it to me if > you'd like me to do it. Either way is fine with me. Sorry for the delay on this. I don't see a patch for this around, so I whipped one up quickly. Stephen - can you check this works for you? If it does, I'll send it to Greg in a new thread with an appropriate subject and all. 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. -- 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 a second of sleep before checking
it's speed capabilities. This adds a quirk for that device and sleeps
if that quirk is present.
Signed-off-by: Phil Dibowitz <phil@xxxxxxxx>
---
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 16:10:11.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_CHECK_SPEED },
+
/* 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 16:14:27.000000000 +0200
@@ -20,11 +20,13 @@
#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>
#include <linux/pm_runtime.h>
+
#include <asm/uaccess.h>
#include <asm/byteorder.h>
@@ -2894,6 +2896,9 @@ check_highspeed (struct usb_hub *hub, st
struct usb_qualifier_descriptor *qual;
int status;
+ if (udev->quirks & USB_QUIRK_CHECK_SPEED) {
+ msleep(1000);
+ }
qual = kmalloc (sizeof *qual, GFP_KERNEL);
if (qual == NULL)
return;
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 16:04:14.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_CHECK_SPEED 0x00000040
+
#endif /* __LINUX_USB_QUIRKS_H */
_
Attachment:
signature.asc
Description: OpenPGP digital signature
