From: Greg Kroah-Hartman Date: Mon, 5 Sep 2022 15:59:26 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.10.142~67 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea8629a5f0057b1799987bcc39600fd84e97f034;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: usb-serial-ftdi_sio-add-omron-cs1w-cif31-device-id.patch --- diff --git a/queue-4.9/series b/queue-4.9/series index 552b303c687..19582f1358f 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -4,3 +4,4 @@ wifi-cfg80211-debugfs-fix-return-type-in-ht40allow_m.patch serial-fsl_lpuart-rs485-rts-polariy-is-inverse.patch staging-rtl8712-fix-use-after-free-bugs.patch vt-clear-selection-before-changing-the-font.patch +usb-serial-ftdi_sio-add-omron-cs1w-cif31-device-id.patch diff --git a/queue-4.9/usb-serial-ftdi_sio-add-omron-cs1w-cif31-device-id.patch b/queue-4.9/usb-serial-ftdi_sio-add-omron-cs1w-cif31-device-id.patch new file mode 100644 index 00000000000..0bba09b5cd4 --- /dev/null +++ b/queue-4.9/usb-serial-ftdi_sio-add-omron-cs1w-cif31-device-id.patch @@ -0,0 +1,51 @@ +From 001047ea241a9646010b2744451dfbc7289542f3 Mon Sep 17 00:00:00 2001 +From: Niek Nooijens +Date: Mon, 1 Aug 2022 10:39:25 +0200 +Subject: USB: serial: ftdi_sio: add Omron CS1W-CIF31 device id + +From: Niek Nooijens + +commit 001047ea241a9646010b2744451dfbc7289542f3 upstream. + +works perfectly with: +modprobe ftdi_sio +echo "0590 00b2" | tee +/sys/module/ftdi_sio/drivers/usb-serial\:ftdi_sio/new_id > /dev/null + +but doing this every reboot is a pain in the ass. + +Signed-off-by: Niek Nooijens +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/ftdi_sio.c | 2 ++ + drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++ + 2 files changed, 8 insertions(+) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -1040,6 +1040,8 @@ static const struct usb_device_id id_tab + /* IDS GmbH devices */ + { USB_DEVICE(IDS_VID, IDS_SI31A_PID) }, + { USB_DEVICE(IDS_VID, IDS_CM31A_PID) }, ++ /* Omron devices */ ++ { USB_DEVICE(OMRON_VID, OMRON_CS1W_CIF31_PID) }, + /* U-Blox devices */ + { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) }, + { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) }, +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -661,6 +661,12 @@ + #define INFINEON_TRIBOARD_TC2X7_PID 0x0043 /* DAS JTAG TriBoard TC2X7 V1.0 */ + + /* ++ * Omron corporation (https://www.omron.com) ++ */ ++ #define OMRON_VID 0x0590 ++ #define OMRON_CS1W_CIF31_PID 0x00b2 ++ ++/* + * Acton Research Corp. + */ + #define ACTON_VID 0x0647 /* Vendor ID */