From 0d91ce72a3b365b201c1433f0688968cb5caac13 Mon Sep 17 00:00:00 2001 From: Pawel Ludwikow Date: Thu, 27 Aug 2009 14:15:50 +0200 Subject: [PATCH] --- yaml --- r: 164918 b: refs/heads/master c: e7d7fcc09ebde1ea1773521ecab5a3f0ad6bef6e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ftdi_sio.c | 2 ++ trunk/drivers/usb/serial/ftdi_sio.h | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a890872744c6..be9a919ac5e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5dc8ae121592239c2a2521d383bcb789849b2a3 +refs/heads/master: e7d7fcc09ebde1ea1773521ecab5a3f0ad6bef6e diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c index 76a17f915eef..f0cb7d646d7d 100644 --- a/trunk/drivers/usb/serial/ftdi_sio.c +++ b/trunk/drivers/usb/serial/ftdi_sio.c @@ -702,6 +702,8 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, { 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_HO870_PID) }, { }, /* Optional parameter entry */ { } /* Terminating entry */ }; diff --git a/trunk/drivers/usb/serial/ftdi_sio.h b/trunk/drivers/usb/serial/ftdi_sio.h index 8c92b88166ae..3c85bfd46729 100644 --- a/trunk/drivers/usb/serial/ftdi_sio.h +++ b/trunk/drivers/usb/serial/ftdi_sio.h @@ -967,6 +967,12 @@ */ #define MARVELL_OPENRD_PID 0x9e90 +/* + * Hameg HO820 and HO870 interface (using VID 0x0403) + */ +#define HAMEG_HO820_PID 0xed74 +#define HAMEG_HO870_PID 0xed71 + /* * BmRequestType: 1100 0000b * bRequest: FTDI_E2_READ