From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: Revert "USB: serial: ftdi_sio: add Id for Physik Instrumente E-870" From: Johan Hovold Message-Id: <20180329123540.3834-1-johan@kernel.org> Date: Thu, 29 Mar 2018 14:35:40 +0200 To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, Martin Teichmann , Johan Hovold , stable List-ID: VGhpcyByZXZlcnRzIGNvbW1pdCA3OWEwYjMzMTY1ZDhkOGVjMDg0MGZjZmM3NGZkMGE4ZjIxOWFi ZWVlLgoKVHVybnMgb3V0IHRoaXMgaXMgbm90IGFuIEZUREkgZGV2aWNlIGFmdGVyIGFsbC4KClJl cG9ydGVkLWJ5OiBNYXJ0aW4gVGVpY2htYW5uIDxtYXJ0aW4udGVpY2htYW5uQHhmZWwuZXU+CkNj OiBzdGFibGUgPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+ClNpZ25lZC1vZmYtYnk6IEpvaGFuIEhv dm9sZCA8am9oYW5Aa2VybmVsLm9yZz4KLS0tCgpHcmVnLAoKSSBpbmNsdWRlZCB0aGUgc3RhYmxl IHRhZyBhYm92ZSBhcyB0aGUgb2ZmZW5kaW5nIHBhdGNoIGhhZCBpdCwgYnV0IEkKd2lsbCB0cnkg dG8gcmVtZW1iZXIgdG8gc3BlYWsgb3V0IGluIGNhc2UgaXQgZ2V0cyBhZGRlZCB0byB0aGUgc3Rh YmxlCnF1ZXVlIGluIHRoZSBmaXJzdCBwbGFjZS4KClRoYW5rcywKSm9oYW4KCiBkcml2ZXJzL3Vz Yi9zZXJpYWwvZnRkaV9zaW8uYyAgICAgfCAxIC0KIGRyaXZlcnMvdXNiL3NlcmlhbC9mdGRpX3Np b19pZHMuaCB8IDEgLQogMiBmaWxlcyBjaGFuZ2VkLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvdXNiL3NlcmlhbC9mdGRpX3Npby5jIGIvZHJpdmVycy91c2Ivc2VyaWFsL2Z0 ZGlfc2lvLmMKaW5kZXggODU3NzRjZjRjYzhmLi5mNThjNGZmNmIzODcgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvdXNiL3NlcmlhbC9mdGRpX3Npby5jCisrKyBiL2RyaXZlcnMvdXNiL3NlcmlhbC9mdGRp X3Npby5jCkBAIC04OTMsNyArODkzLDYgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCB1c2JfZGV2aWNl X2lkIGlkX3RhYmxlX2NvbWJpbmVkW10gPSB7CiAJeyBVU0JfREVWSUNFKFBJX1ZJRCwgUElfMTAx NF9QSUQpIH0sCiAJeyBVU0JfREVWSUNFKFBJX1ZJRCwgUElfMTAxNV9QSUQpIH0sCiAJeyBVU0Jf REVWSUNFKFBJX1ZJRCwgUElfMTAxNl9QSUQpIH0sCi0JeyBVU0JfREVWSUNFKFBJX1ZJRCwgUElf RTg3MF9QSUQpIH0sCiAJeyBVU0JfREVWSUNFKEtPTkRPX1ZJRCwgS09ORE9fVVNCX1NFUklBTF9Q SUQpIH0sCiAJeyBVU0JfREVWSUNFKEJBWUVSX1ZJRCwgQkFZRVJfQ09OVE9VUl9DQUJMRV9QSUQp IH0sCiAJeyBVU0JfREVWSUNFKEZURElfVklELCBNQVJWRUxMX09QRU5SRF9QSUQpLApkaWZmIC0t Z2l0IGEvZHJpdmVycy91c2Ivc2VyaWFsL2Z0ZGlfc2lvX2lkcy5oIGIvZHJpdmVycy91c2Ivc2Vy aWFsL2Z0ZGlfc2lvX2lkcy5oCmluZGV4IDE0ZGZmNDRhMmE5My4uOGI0ZWNkMmJkMjk3IDEwMDY0 NAotLS0gYS9kcml2ZXJzL3VzYi9zZXJpYWwvZnRkaV9zaW9faWRzLmgKKysrIGIvZHJpdmVycy91 c2Ivc2VyaWFsL2Z0ZGlfc2lvX2lkcy5oCkBAIC05NzgsNyArOTc4LDYgQEAKICNkZWZpbmUgUElf MTAxNF9QSUQJMHgxMDE0ICAvKiBQSSBEZXZpY2UgKi8KICNkZWZpbmUgUElfMTAxNV9QSUQJMHgx MDE1ICAvKiBQSSBEZXZpY2UgKi8KICNkZWZpbmUgUElfMTAxNl9QSUQJMHgxMDE2ICAvKiBQSSBE aWdpdGFsIFNlcnZvIE1vZHVsZSAqLwotI2RlZmluZSBQSV9FODcwX1BJRAkweDEwMTkgIC8qIFBJ IEUtODcwIFBpZXpvbW90b3IgQ29udHJvbGxlciAqLwogCiAvKgogICogS29uZG8gS2FnYWt1IENv Lkx0ZC4K From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f68.google.com ([209.85.215.68]:33387 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751227AbeC2Mfx (ORCPT ); Thu, 29 Mar 2018 08:35:53 -0400 From: Johan Hovold To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, Martin Teichmann , Johan Hovold , stable Subject: [PATCH] Revert "USB: serial: ftdi_sio: add Id for Physik Instrumente E-870" Date: Thu, 29 Mar 2018 14:35:40 +0200 Message-Id: <20180329123540.3834-1-johan@kernel.org> Sender: stable-owner@vger.kernel.org List-ID: This reverts commit 79a0b33165d8d8ec0840fcfc74fd0a8f219abeee. Turns out this is not an FTDI device after all. Reported-by: Martin Teichmann Cc: stable Signed-off-by: Johan Hovold --- Greg, I included the stable tag above as the offending patch had it, but I will try to remember to speak out in case it gets added to the stable queue in the first place. Thanks, Johan drivers/usb/serial/ftdi_sio.c | 1 - drivers/usb/serial/ftdi_sio_ids.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 85774cf4cc8f..f58c4ff6b387 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -893,7 +893,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 14dff44a2a93..8b4ecd2bd297 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h @@ -978,7 +978,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. -- 2.16.3