Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee932bf9 authored Feb 21, 2012 by Scott Talbert Committed by David S. Miller Feb 22, 2012

Move Logitech Harmony 900 from cdc_ether to zaurus



In the current kernel implementation, the Logitech Harmony 900 remote
control is matched to the cdc_ether driver through the generic
USB_CDC_SUBCLASS_MDLM entry.  However, this device appears to be of the
pseudo-MDLM (Belcarra) type, rather than the standard one.  This patch
blacklists the Harmony 900 from the cdc_ether driver and whitelists it for
the pseudo-MDLM driver in zaurus.

Signed-off-by: Scott Talbert <talbert@techie.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 22ad7499

drivers/net/usb/cdc_ether.c

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -573,6 +573,13 @@ static const struct usb_device_id products [] = {
	.driver_info = 0,		.driver_info = 0,
	},		},

			/* 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!!!		* WHITELIST!!!
	*		*

drivers/net/usb/zaurus.c

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -354,6 +354,13 @@ static const struct usb_device_id products [] = {
	ZAURUS_MASTER_INTERFACE,		ZAURUS_MASTER_INTERFACE,
	.driver_info = OLYMPUS_MXL_INFO,		.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		{ }, // END
	};		};
	MODULE_DEVICE_TABLE(usb, products);		MODULE_DEVICE_TABLE(usb, products);