Skip to content

Commit a5cc53f

Browse files
committed
Merge tag 'usb-serial-7.1-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes: USB serial updates for 7.1-rc1 Here are the USB serial updates for 7.1-rc1, including: - use strscpy() instead of strcpy() - new modem device id All have been in linux-next with no reported issues. * tag 'usb-serial-7.1-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial: USB: serial: iuu_phoenix: fix iuutool author name USB: serial: option: add Telit Cinterion FN990A MBIM composition USB: serial: ti_usb_3410_5052: use strscpy() instead of strcpy()
2 parents cd1be4b + 37d9c4c commit a5cc53f

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/usb/serial/iuu_phoenix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
77
* Copyright (C) 2007 Alain Degreffe (eczema@ecze.com)
88
*
9-
* Original code taken from iuutool (Copyright (C) 2006 Juan Carlos Borrás)
9+
* Original code taken from iuutool (Copyright (C) 2006 Juan Carlos Borrás)
1010
*
1111
* And tested with help of WB Electronics
1212
*/

drivers/usb/serial/option.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,6 +1383,8 @@ static const struct usb_device_id option_ids[] = {
13831383
.driver_info = NCTRL(2) | RSVD(3) },
13841384
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1073, 0xff), /* Telit FN990A (ECM) */
13851385
.driver_info = NCTRL(0) | RSVD(1) },
1386+
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1074, 0xff), /* Telit FN990A (MBIM) */
1387+
.driver_info = NCTRL(5) | RSVD(6) | RSVD(7) },
13861388
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1075, 0xff), /* Telit FN990A (PCIe) */
13871389
.driver_info = RSVD(0) },
13881390
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1077, 0xff), /* Telit FN990A (rmnet + audio) */

0 commit comments

Comments
 (0)