Skip to content

Commit b99225b

Browse files
Ross Maynardkuba-moo
authored andcommitted
USB: zaurus: Add ID for A-300/B-500/C-700
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: 16adf5d ("usbnet: Remove over-broad module alias from zaurus.") Signed-off-by: Ross Maynard <[email protected]> Cc: [email protected] Acked-by: Greg Kroah-Hartman <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent ef45e84 commit b99225b

File tree

2 files changed

+42
-0
lines changed

2 files changed

+42
-0
lines changed

drivers/net/usb/cdc_ether.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,16 +618,37 @@ static const struct usb_device_id products[] = {
618618
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
619619
| USB_DEVICE_ID_MATCH_DEVICE,
620620
.idVendor = 0x04DD,
621+
.idProduct = 0x8005, /* A-300 */
622+
ZAURUS_FAKE_INTERFACE,
623+
.driver_info = 0,
624+
}, {
625+
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
626+
| USB_DEVICE_ID_MATCH_DEVICE,
627+
.idVendor = 0x04DD,
621628
.idProduct = 0x8006, /* B-500/SL-5600 */
622629
ZAURUS_MASTER_INTERFACE,
623630
.driver_info = 0,
631+
}, {
632+
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
633+
| USB_DEVICE_ID_MATCH_DEVICE,
634+
.idVendor = 0x04DD,
635+
.idProduct = 0x8006, /* B-500/SL-5600 */
636+
ZAURUS_FAKE_INTERFACE,
637+
.driver_info = 0,
624638
}, {
625639
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
626640
| USB_DEVICE_ID_MATCH_DEVICE,
627641
.idVendor = 0x04DD,
628642
.idProduct = 0x8007, /* C-700 */
629643
ZAURUS_MASTER_INTERFACE,
630644
.driver_info = 0,
645+
}, {
646+
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
647+
| USB_DEVICE_ID_MATCH_DEVICE,
648+
.idVendor = 0x04DD,
649+
.idProduct = 0x8007, /* C-700 */
650+
ZAURUS_FAKE_INTERFACE,
651+
.driver_info = 0,
631652
}, {
632653
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
633654
| USB_DEVICE_ID_MATCH_DEVICE,

drivers/net/usb/zaurus.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,16 +289,37 @@ static const struct usb_device_id products [] = {
289289
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
290290
| USB_DEVICE_ID_MATCH_DEVICE,
291291
.idVendor = 0x04DD,
292+
.idProduct = 0x8005, /* A-300 */
293+
ZAURUS_FAKE_INTERFACE,
294+
.driver_info = (unsigned long)&bogus_mdlm_info,
295+
}, {
296+
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
297+
| USB_DEVICE_ID_MATCH_DEVICE,
298+
.idVendor = 0x04DD,
292299
.idProduct = 0x8006, /* B-500/SL-5600 */
293300
ZAURUS_MASTER_INTERFACE,
294301
.driver_info = ZAURUS_PXA_INFO,
302+
}, {
303+
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
304+
| USB_DEVICE_ID_MATCH_DEVICE,
305+
.idVendor = 0x04DD,
306+
.idProduct = 0x8006, /* B-500/SL-5600 */
307+
ZAURUS_FAKE_INTERFACE,
308+
.driver_info = (unsigned long)&bogus_mdlm_info,
295309
}, {
296310
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
297311
| USB_DEVICE_ID_MATCH_DEVICE,
298312
.idVendor = 0x04DD,
299313
.idProduct = 0x8007, /* C-700 */
300314
ZAURUS_MASTER_INTERFACE,
301315
.driver_info = ZAURUS_PXA_INFO,
316+
}, {
317+
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
318+
| USB_DEVICE_ID_MATCH_DEVICE,
319+
.idVendor = 0x04DD,
320+
.idProduct = 0x8007, /* C-700 */
321+
ZAURUS_FAKE_INTERFACE,
322+
.driver_info = (unsigned long)&bogus_mdlm_info,
302323
}, {
303324
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
304325
| USB_DEVICE_ID_MATCH_DEVICE,

0 commit comments

Comments
 (0)