aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/net
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2007-02-15 21:50:01 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2007-02-16 18:32:22 -0500
commit6e91f527cd0644530894ee3bfb06d209d3c8c54a (patch)
treebd48bd7d086f42c9de745a3949ac0c77575bbadc /drivers/usb/net
parent6160beb5bfcf8d3cddeecc4e5cd6847621b50893 (diff)
usbnet: recognize SiteCom CN-124
Add Sitecom CN-124 device IDs to ALI M5632 usb host-to-host cable; device IDs from Francois Barre <francois.barre@gmail.com> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/net')
-rw-r--r--drivers/usb/net/cdc_subset.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/usb/net/cdc_subset.c b/drivers/usb/net/cdc_subset.c
index ae8fb06cf38..6e3fead26ce 100644
--- a/drivers/usb/net/cdc_subset.c
+++ b/drivers/usb/net/cdc_subset.c
@@ -79,13 +79,19 @@ static int always_connected (struct usbnet *dev)
79 * 79 *
80 * ALi M5632 driver ... does high speed 80 * ALi M5632 driver ... does high speed
81 * 81 *
82 * NOTE that the MS-Windows drivers for this chip use some funky and
83 * (naturally) undocumented 7-byte prefix to each packet, so this is a
84 * case where we don't currently interoperate. Also, once you unplug
85 * one end of the cable, you need to replug the other end too ... since
86 * chip docs are unavailable, there's no way to reset the relevant state
87 * short of a power cycle.
88 *
82 *-------------------------------------------------------------------------*/ 89 *-------------------------------------------------------------------------*/
83 90
84static const struct driver_info ali_m5632_info = { 91static const struct driver_info ali_m5632_info = {
85 .description = "ALi M5632", 92 .description = "ALi M5632",
86}; 93};
87 94
88
89#endif 95#endif
90 96
91 97
@@ -223,6 +229,10 @@ static const struct usb_device_id products [] = {
223 USB_DEVICE (0x0402, 0x5632), // ALi defaults 229 USB_DEVICE (0x0402, 0x5632), // ALi defaults
224 .driver_info = (unsigned long) &ali_m5632_info, 230 .driver_info = (unsigned long) &ali_m5632_info,
225}, 231},
232{
233 USB_DEVICE (0x182d,0x207c), // SiteCom CN-124
234 .driver_info = (unsigned long) &ali_m5632_info,
235},
226#endif 236#endif
227 237
228#ifdef CONFIG_USB_AN2720 238#ifdef CONFIG_USB_AN2720
@@ -314,13 +324,13 @@ static struct usb_driver cdc_subset_driver = {
314 324
315static int __init cdc_subset_init(void) 325static int __init cdc_subset_init(void)
316{ 326{
317 return usb_register(&cdc_subset_driver); 327 return usb_register(&cdc_subset_driver);
318} 328}
319module_init(cdc_subset_init); 329module_init(cdc_subset_init);
320 330
321static void __exit cdc_subset_exit(void) 331static void __exit cdc_subset_exit(void)
322{ 332{
323 usb_deregister(&cdc_subset_driver); 333 usb_deregister(&cdc_subset_driver);
324} 334}
325module_exit(cdc_subset_exit); 335module_exit(cdc_subset_exit);
326 336