Skip to contentSkip to conversation

patch "Revert "USB: serial: ftdi_sio: add Id for Physik Instrumente E-870"" added to usb-next

PATCH [email protected] 1 participant 1 message Mar 29, 2018

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

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

to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-next branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will also be merged in the next major kernel release during the merge window.

If you have any questions about this process, please let me know.

Quoted 1 line

From 5267c5e09c25e2ee6242b37833a9bdf9d97f54a2 Mon Sep 17 00:00:00 2001

From: Johan Hovold <[email protected]>
Date: Thu, 29 Mar 2018 14:35:40 +0200
Subject: 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")
Cc stable <[email protected]>
---
 drivers/usb/serial/ftdi_sio.c     | 1 -
 drivers/usb/serial/ftdi_sio_ids.h | 1 -
 2 files changed, 2 deletions(-)
drivers/usb/serial/ftdi_sio.c +0 -1
index 566f25781ea0..87202ad5a50d 100644
@@ -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
index f7790758de7c..975d02666c5a 100644
@@ -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.
Signature · 1 line
2.16.3