aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/usb/gs_usb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/can/usb/gs_usb.c')
-rw-r--r--drivers/net/can/usb/gs_usb.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
index 360764324c54..6f0cbc38782e 100644
--- a/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@ -1,7 +1,9 @@
1/* CAN driver for Geschwister Schneider USB/CAN devices. 1/* CAN driver for Geschwister Schneider USB/CAN devices
2 * and bytewerk.org candleLight USB CAN interfaces.
2 * 3 *
3 * Copyright (C) 2013 Geschwister Schneider Technologie-, 4 * Copyright (C) 2013-2016 Geschwister Schneider Technologie-,
4 * Entwicklungs- und Vertriebs UG (Haftungsbeschränkt). 5 * Entwicklungs- und Vertriebs UG (Haftungsbeschränkt).
6 * Copyright (C) 2016 Hubert Denkmair
5 * 7 *
6 * Many thanks to all socketcan devs! 8 * Many thanks to all socketcan devs!
7 * 9 *
@@ -29,6 +31,9 @@
29#define USB_GSUSB_1_VENDOR_ID 0x1d50 31#define USB_GSUSB_1_VENDOR_ID 0x1d50
30#define USB_GSUSB_1_PRODUCT_ID 0x606f 32#define USB_GSUSB_1_PRODUCT_ID 0x606f
31 33
34#define USB_CANDLELIGHT_VENDOR_ID 0x1209
35#define USB_CANDLELIGHT_PRODUCT_ID 0x2323
36
32#define GSUSB_ENDPOINT_IN 1 37#define GSUSB_ENDPOINT_IN 1
33#define GSUSB_ENDPOINT_OUT 2 38#define GSUSB_ENDPOINT_OUT 2
34 39
@@ -1009,6 +1014,8 @@ static void gs_usb_disconnect(struct usb_interface *intf)
1009static const struct usb_device_id gs_usb_table[] = { 1014static const struct usb_device_id gs_usb_table[] = {
1010 { USB_DEVICE_INTERFACE_NUMBER(USB_GSUSB_1_VENDOR_ID, 1015 { USB_DEVICE_INTERFACE_NUMBER(USB_GSUSB_1_VENDOR_ID,
1011 USB_GSUSB_1_PRODUCT_ID, 0) }, 1016 USB_GSUSB_1_PRODUCT_ID, 0) },
1017 { USB_DEVICE_INTERFACE_NUMBER(USB_CANDLELIGHT_VENDOR_ID,
1018 USB_CANDLELIGHT_PRODUCT_ID, 0) },
1012 {} /* Terminating entry */ 1019 {} /* Terminating entry */
1013}; 1020};
1014 1021
@@ -1026,5 +1033,6 @@ module_usb_driver(gs_usb_driver);
1026MODULE_AUTHOR("Maximilian Schneider <mws@schneidersoft.net>"); 1033MODULE_AUTHOR("Maximilian Schneider <mws@schneidersoft.net>");
1027MODULE_DESCRIPTION( 1034MODULE_DESCRIPTION(
1028"Socket CAN device driver for Geschwister Schneider Technologie-, " 1035"Socket CAN device driver for Geschwister Schneider Technologie-, "
1029"Entwicklungs- und Vertriebs UG. USB2.0 to CAN interfaces."); 1036"Entwicklungs- und Vertriebs UG. USB2.0 to CAN interfaces\n"
1037"and bytewerk.org candleLight USB CAN interfaces.");
1030MODULE_LICENSE("GPL v2"); 1038MODULE_LICENSE("GPL v2");