]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - releases/3.0.23/usb-serial-ti_usb_3410_5052-add-abbot-diabetes-care-cable-id.patch
Fix up backported ptrace patch
[thirdparty/kernel/stable-queue.git] / releases / 3.0.23 / usb-serial-ti_usb_3410_5052-add-abbot-diabetes-care-cable-id.patch
1 From 7fd25702ba616d9ba56e2a625472f29e5aff25ee Mon Sep 17 00:00:00 2001
2 From: Andrew Lunn <andrew@lunn.ch>
3 Date: Mon, 20 Feb 2012 09:31:57 +0100
4 Subject: USB: Serial: ti_usb_3410_5052: Add Abbot Diabetes Care cable id
5
6 From: Andrew Lunn <andrew@lunn.ch>
7
8 commit 7fd25702ba616d9ba56e2a625472f29e5aff25ee upstream.
9
10 This USB-serial cable with mini stereo jack enumerates as:
11 Bus 001 Device 004: ID 1a61:3410 Abbott Diabetes Care
12
13 It is a TI3410 inside.
14
15 Signed-off-by: Andrew Lunn <andrew@lunn.ch>
16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
17
18 ---
19 drivers/usb/serial/ti_usb_3410_5052.c | 6 ++++--
20 drivers/usb/serial/ti_usb_3410_5052.h | 4 ++++
21 2 files changed, 8 insertions(+), 2 deletions(-)
22
23 --- a/drivers/usb/serial/ti_usb_3410_5052.c
24 +++ b/drivers/usb/serial/ti_usb_3410_5052.c
25 @@ -165,7 +165,7 @@ static unsigned int product_5052_count;
26 /* the array dimension is the number of default entries plus */
27 /* TI_EXTRA_VID_PID_COUNT user defined entries plus 1 terminating */
28 /* null entry */
29 -static struct usb_device_id ti_id_table_3410[13+TI_EXTRA_VID_PID_COUNT+1] = {
30 +static struct usb_device_id ti_id_table_3410[14+TI_EXTRA_VID_PID_COUNT+1] = {
31 { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },
32 { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },
33 { USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
34 @@ -179,6 +179,7 @@ static struct usb_device_id ti_id_table_
35 { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
36 { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
37 { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
38 + { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) },
39 };
40
41 static struct usb_device_id ti_id_table_5052[5+TI_EXTRA_VID_PID_COUNT+1] = {
42 @@ -188,7 +189,7 @@ static struct usb_device_id ti_id_table_
43 { USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) },
44 };
45
46 -static struct usb_device_id ti_id_table_combined[17+2*TI_EXTRA_VID_PID_COUNT+1] = {
47 +static struct usb_device_id ti_id_table_combined[18+2*TI_EXTRA_VID_PID_COUNT+1] = {
48 { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },
49 { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },
50 { USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
51 @@ -206,6 +207,7 @@ static struct usb_device_id ti_id_table_
52 { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
53 { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
54 { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
55 + { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) },
56 { }
57 };
58
59 --- a/drivers/usb/serial/ti_usb_3410_5052.h
60 +++ b/drivers/usb/serial/ti_usb_3410_5052.h
61 @@ -49,6 +49,10 @@
62 #define MTS_MT9234ZBA_PRODUCT_ID 0xF115
63 #define MTS_MT9234ZBAOLD_PRODUCT_ID 0x0319
64
65 +/* Abbott Diabetics vendor and product ids */
66 +#define ABBOTT_VENDOR_ID 0x1a61
67 +#define ABBOTT_PRODUCT_ID 0x3410
68 +
69 /* Commands */
70 #define TI_GET_VERSION 0x01
71 #define TI_GET_PORT_STATUS 0x02