Commit a5cc53f0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-7.1-rc1' of... 

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()
parents cd1be4b2 37d9c4c0

drivers/usb/serial/iuu_phoenix.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


 * Copyright (C) 2007 Alain Degreffe (eczema@ecze.com)

 *

 * Original code taken from iuutool (Copyright (C) 2006 Juan Carlos Borrás)

 * Original code taken from iuutool (Copyright (C) 2006 Juan Carlos Borrás)

 *

 *  And tested with help of WB Electronics

 */

drivers/usb/serial/option.c

+2 −0
Original line number Diff line number Diff line
@@ -1383,6 +1383,8 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = NCTRL(2) | RSVD(3) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1073, 0xff),	/* Telit FN990A (ECM) */

	  .driver_info = NCTRL(0) | RSVD(1) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1074, 0xff),	/* Telit FN990A (MBIM) */

	  .driver_info = NCTRL(5) | RSVD(6) | RSVD(7) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1075, 0xff),	/* Telit FN990A (PCIe) */

	  .driver_info = RSVD(0) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1077, 0xff),	/* Telit FN990A (rmnet + audio) */