Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5267c5e0 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

Revert "USB: serial: ftdi_sio: add Id for Physik Instrumente E-870" 



This reverts commit 79a0b331.

Turns out this is not an FTDI device after all.

Fixes: 79a0b331 ("USB: serial: ftdi_sio: add Id for Physik Instrumente E-870")
Reported-by: default avatarMartin Teichmann <martin.teichmann@xfel.eu>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af6f8529

drivers/usb/serial/ftdi_sio.c

+0 −1
Original line number Diff line number Diff line
@@ -894,7 +894,6 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(PI_VID, PI_1014_PID) },

	{ USB_DEVICE(PI_VID, PI_1015_PID) },

	{ USB_DEVICE(PI_VID, PI_1016_PID) },

	{ USB_DEVICE(PI_VID, PI_E870_PID) },

	{ USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) },

	{ USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },

	{ USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),

drivers/usb/serial/ftdi_sio_ids.h

+0 −1
Original line number Diff line number Diff line
@@ -981,7 +981,6 @@ 
#define PI_1014_PID	0x1014  /* PI Device */

#define PI_1015_PID	0x1015  /* PI Device */

#define PI_1016_PID	0x1016  /* PI Digital Servo Module */

#define PI_E870_PID	0x1019  /* PI E-870 Piezomotor Controller */



/*

 * Kondo Kagaku Co.Ltd.