Thread (4 messages) flat view 4 messages, 2 authors, 2012-02-21
STALE5293d

[PATCH] cdc_ether/zaurus: Move Harmony 900 from cdc_ether to zaurus

From: Scott Talbert <hidden>
Date: 2012-02-20 02:07:57
Subsystem: networking drivers, the rest, usb cdc ethernet driver, usb networking drivers · Maintainers: Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, Oliver Neukum

Hello,

The Logitech Harmony 900 remote control appears to use the pseudo-MDLM 
driver, rather than the standard one.  This patch simply moves the device 
so that it gets picked up by the correct driver.

Signed-off-by: Scott Talbert <redacted>
---
  drivers/net/usb/cdc_ether.c |    7 +++++++
  drivers/net/usb/zaurus.c    |    7 +++++++
  2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index c924ea2..13919dd 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -570,6 +570,13 @@ static const struct usb_device_id	products [] = {
  	.driver_info = (unsigned long)&wwan_info,
  },

+/* Logitech Harmony 900 - uses the pseudo-MDLM (BLAN) driver */
+{
+	USB_DEVICE_AND_INTERFACE_INFO(0x046d, 0xc11f, USB_CLASS_COMM,
+			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+	.driver_info		= 0,
+},
+
  /*
   * WHITELIST!!!
   *
diff --git a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c
index 1a2234c..246b3bb 100644
--- a/drivers/net/usb/zaurus.c
+++ b/drivers/net/usb/zaurus.c
@@ -349,6 +349,13 @@ static const struct usb_device_id	products [] = {
  	ZAURUS_MASTER_INTERFACE,
  	.driver_info = OLYMPUS_MXL_INFO,
  },
+
+/* Logitech Harmony 900 - uses the pseudo-MDLM (BLAN) driver */
+{
+	USB_DEVICE_AND_INTERFACE_INFO(0x046d, 0xc11f, USB_CLASS_COMM,
+			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+	.driver_info = (unsigned long) &bogus_mdlm_info,
+},
  	{ },		// END
  };
  MODULE_DEVICE_TABLE(usb, products);
-- 
1.7.5.4
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help