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

This reverts commit 79a0b33165d8d8ec0840fcfc74fd0a8f219abeee.

Turns out this is not an FTDI device after all.

Fixes: 79a0b33165d8 ("USB: serial: ftdi_sio: add Id for Physik Instrumente E-870")
Reported-by: Martin Teichmann <martin.teichmann@xfel.eu>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 566f25781ea023d7821b14fe2940a9dace96d3cd..87202ad5a50dfb4d8afe865ce57a7b5fbe0d6b8b 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -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),

diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index f7790758de7c70f548e27e949b0a17ddfae00f24..975d02666c5a0cf93cd647d8667f988e589c8171 100644 (file)
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -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.