aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Friedrich <Paul.Friedrich@hameg.com>2011-03-18 11:13:55 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-13 15:52:19 -0700
commitc53c2fab40cf16e13af66f40bfd27200cda98d2f (patch)
tree6c51da89a7d2733636105799988e20fa08c16c20
parent80f9df3e0093ad9f1eeefd2ff7fd27daaa518d25 (diff)
downloadkernel_samsung_smdk4412-c53c2fab40cf16e13af66f40bfd27200cda98d2f.zip
kernel_samsung_smdk4412-c53c2fab40cf16e13af66f40bfd27200cda98d2f.tar.gz
kernel_samsung_smdk4412-c53c2fab40cf16e13af66f40bfd27200cda98d2f.tar.bz2
USB: ftdi_sio: add ids for Hameg HO720 and HO730
usb serial: ftdi_sio: add two missing USB ID's for Hameg interfaces HO720 and HO730 Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/serial/ftdi_sio.c2
-rw-r--r--drivers/usb/serial/ftdi_sio_ids.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 51b7801..4de6ef0 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -790,6 +790,8 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),
.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
{ USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) },
+ { USB_DEVICE(FTDI_VID, HAMEG_HO720_PID) },
+ { USB_DEVICE(FTDI_VID, HAMEG_HO730_PID) },
{ USB_DEVICE(FTDI_VID, HAMEG_HO870_PID) },
{ USB_DEVICE(FTDI_VID, MJSG_GENERIC_PID) },
{ USB_DEVICE(FTDI_VID, MJSG_SR_RADIO_PID) },
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 0bdba7a..efffc23 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -300,6 +300,8 @@
* Hameg HO820 and HO870 interface (using VID 0x0403)
*/
#define HAMEG_HO820_PID 0xed74
+#define HAMEG_HO730_PID 0xed73
+#define HAMEG_HO720_PID 0xed72
#define HAMEG_HO870_PID 0xed71
/*