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

Commit ad047663 authored by Ross Maynard's avatar Ross Maynard Committed by Greg Kroah-Hartman
Browse files

USB: zaurus: Add ID for A-300/B-500/C-700 

commit b99225b4fe297d07400f9e2332ecd7347b224f8d upstream.

The SL-A300, B500/5600, and C700 devices no longer auto-load because of
"usbnet: Remove over-broad module alias from zaurus."
This patch adds IDs for those 3 devices.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=217632


Fixes: 16adf5d0 ("usbnet: Remove over-broad module alias from zaurus.")
Signed-off-by: default avatarRoss Maynard <bids.7405@bigpond.com>
Cc: stable@vger.kernel.org
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/69b5423b-2013-9fc9-9569-58e707d9bafb@bigpond.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 83a9d9b9

drivers/net/usb/cdc_ether.c

+21 −0
Original line number Diff line number Diff line
@@ -614,6 +614,13 @@ static const struct usb_device_id products[] = { 
	.idProduct		= 0x8005,	/* A-300 */

	ZAURUS_MASTER_INTERFACE,

	.driver_info		= 0,

}, {

	.match_flags	=   USB_DEVICE_ID_MATCH_INT_INFO

			  | USB_DEVICE_ID_MATCH_DEVICE,

	.idVendor		= 0x04DD,

	.idProduct		= 0x8005,   /* A-300 */

	ZAURUS_FAKE_INTERFACE,

	.driver_info        = 0,

}, {

	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO

			  | USB_DEVICE_ID_MATCH_DEVICE,
@@ -621,6 +628,13 @@ static const struct usb_device_id products[] = { 
	.idProduct		= 0x8006,	/* B-500/SL-5600 */

	ZAURUS_MASTER_INTERFACE,

	.driver_info		= 0,

}, {

	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO

			  | USB_DEVICE_ID_MATCH_DEVICE,

	.idVendor		= 0x04DD,

	.idProduct		= 0x8006,   /* B-500/SL-5600 */

	ZAURUS_FAKE_INTERFACE,

	.driver_info        = 0,

}, {

	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO

			  | USB_DEVICE_ID_MATCH_DEVICE,
@@ -628,6 +642,13 @@ static const struct usb_device_id products[] = { 
	.idProduct		= 0x8007,	/* C-700 */

	ZAURUS_MASTER_INTERFACE,

	.driver_info		= 0,

}, {

	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO

			  | USB_DEVICE_ID_MATCH_DEVICE,

	.idVendor		= 0x04DD,

	.idProduct		= 0x8007,   /* C-700 */

	ZAURUS_FAKE_INTERFACE,

	.driver_info        = 0,

}, {

	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO

		 | USB_DEVICE_ID_MATCH_DEVICE,

drivers/net/usb/zaurus.c

+21 −0
Original line number Diff line number Diff line
@@ -297,6 +297,13 @@ static const struct usb_device_id products [] = { 
	.idProduct		= 0x8005,	/* A-300 */

	ZAURUS_MASTER_INTERFACE,

	.driver_info = ZAURUS_PXA_INFO,

}, {

	.match_flags	=   USB_DEVICE_ID_MATCH_INT_INFO

			  | USB_DEVICE_ID_MATCH_DEVICE,

	.idVendor		= 0x04DD,

	.idProduct		= 0x8005,	/* A-300 */

	ZAURUS_FAKE_INTERFACE,

	.driver_info = (unsigned long)&bogus_mdlm_info,

}, {

	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO

			  | USB_DEVICE_ID_MATCH_DEVICE,
@@ -304,6 +311,13 @@ static const struct usb_device_id products [] = { 
	.idProduct		= 0x8006,	/* B-500/SL-5600 */

	ZAURUS_MASTER_INTERFACE,

	.driver_info = ZAURUS_PXA_INFO,

}, {

	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO

			  | USB_DEVICE_ID_MATCH_DEVICE,

	.idVendor		= 0x04DD,

	.idProduct		= 0x8006,	/* B-500/SL-5600 */

	ZAURUS_FAKE_INTERFACE,

	.driver_info = (unsigned long)&bogus_mdlm_info,

}, {

	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO

	          | USB_DEVICE_ID_MATCH_DEVICE,
@@ -311,6 +325,13 @@ static const struct usb_device_id products [] = { 
	.idProduct		= 0x8007,	/* C-700 */

	ZAURUS_MASTER_INTERFACE,

	.driver_info = ZAURUS_PXA_INFO,

}, {

	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO

			  | USB_DEVICE_ID_MATCH_DEVICE,

	.idVendor		= 0x04DD,

	.idProduct		= 0x8007,	/* C-700 */

	ZAURUS_FAKE_INTERFACE,

	.driver_info = (unsigned long)&bogus_mdlm_info,

}, {

	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO

		 | USB_DEVICE_ID_MATCH_DEVICE,