Commit efcaa205 authored May 30, 2006 by David Brownell Committed by Greg Kroah-Hartman Jun 21, 2006

[PATCH] USB: cdc_ether: recognize olympus r1000 (fix regression)



Earlier work splitting the "usbnet" driver out into a core plus driver
modules was missing a blacklist entry for the Olympus R-1000; it must
not use the CDC Ethernet driver, only the "zaurus" support works with
it.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent d5ce1379

drivers/usb/net/cdc_ether.c

+12 −0

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

		/* Olympus has some models with a Zaurus-compatible option.
		* R-1000 uses a FreeScale i.MXL cpu (ARMv4T)
		*/
		{
		.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
		\| USB_DEVICE_ID_MATCH_DEVICE,
		.idVendor = 0x07B4,
		.idProduct = 0x0F02, /* R-1000 */
		ZAURUS_MASTER_INTERFACE,
		.driver_info = 0,
		},

		/*
		* WHITELIST!!!
		*