diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-03-08 08:53:27 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-03-08 08:53:27 +0000 |
| commit | d99e42ce6b8341d3f09e22c6706461ec900fe172 (patch) | |
| tree | fd87279a7f282739a8633b8b27d3d3a809a32b1d /drivers/usb/serial/ftdi_sio.c | |
| parent | 600556809f04eb3bbccd05218215dcd7b285a9a9 (diff) | |
| parent | b1a8da9ff1395c4879b4bd41e55733d944f3d613 (diff) | |
Merge tag 'usb-serial-6.9-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes:
USB-serial updates for 6.9-rc1
Here are the USB-serial updates for 6.9-rc1, including:
- new device ids
- removal of some redundant assignments
All have been in linux-next with no reported issues.
* tag 'usb-serial-6.9-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M
USB: serial: keyspan: remove redundant assignment to pointer data
USB: serial: ftdi_sio: remove redundant assignment to variable cflag
USB: serial: oti6858: remove redundant assignment to variable divisor
USB: serial: option: add MeiG Smart SLM320 product
USB: serial: cp210x: add ID for MGP Instruments PDS100
USB: serial: add device ID for VeriFone adapter
USB: serial: ftdi_sio: add support for GMC Z216C Adapter IR-USB
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 13a56783830d..76a04ab41100 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1077,6 +1077,8 @@ static const struct usb_device_id id_table_combined[] = { .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { USB_DEVICE(FTDI_VID, FTDI_FALCONIA_JTAG_UNBUF_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + /* GMC devices */ + { USB_DEVICE(GMC_VID, GMC_Z216C_PID) }, { } /* Terminating entry */ }; @@ -2610,7 +2612,7 @@ static void ftdi_set_termios(struct tty_struct *tty, struct device *ddev = &port->dev; struct ftdi_private *priv = usb_get_serial_port_data(port); struct ktermios *termios = &tty->termios; - unsigned int cflag = termios->c_cflag; + unsigned int cflag; u16 value, index; int ret; |