diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-03 09:20:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-03 09:20:31 +0200 |
| commit | 7f61abcdb1afb5aea34258b78341aa972d38b8b9 (patch) | |
| tree | 109884f9843a40f84a36d4bed2920e2d2b34ac51 /drivers/usb/serial/ftdi_sio.c | |
| parent | Merge tag 'phy-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/kish... (diff) | |
| parent | USB: serial: ftdi_sio: add ID for isodebug v1 (diff) | |
| download | linux-7f61abcdb1afb5aea34258b78341aa972d38b8b9.tar.xz linux-7f61abcdb1afb5aea34258b78341aa972d38b8b9.zip | |
Merge tag 'usb-serial-5.3-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes:
USB-serial updates for 5.3-rc1
Here are the USB-serial updates for 5.3-rc1; just some new device ids
this time.
All have been in linux-next with no reported issues.
Signed-off-by: Johan Hovold <johan@kernel.org>
* tag 'usb-serial-5.3-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
USB: serial: ftdi_sio: add ID for isodebug v1
USB: serial: option: add support for GosunCn ME3630 RNDIS mode
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 8b15bbf545d4..4b3a049561f3 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1029,6 +1029,7 @@ static const struct usb_device_id id_table_combined[] = { { USB_DEVICE(AIRBUS_DS_VID, AIRBUS_DS_P8GR) }, /* EZPrototypes devices */ { USB_DEVICE(EZPROTOTYPES_VID, HJELMSLUND_USB485_ISO_PID) }, + { USB_DEVICE_INTERFACE_NUMBER(UNJO_VID, UNJO_ISODEBUG_V1_PID, 1) }, { } /* Terminating entry */ }; |