Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d93cb349 authored by Mans Rullgard's avatar Mans Rullgard Committed by Greg Kroah-Hartman
Browse files

USB: serial: option: set driver_info for SIM5218 and compatibles 



commit f8df5c2c3e2df5ffaf9fb5503da93d477a8c7db4 upstream.

The SIMCom SIM5218 and compatible devices have 5 USB interfaces, only 4
of which are serial ports.  The fifth is a network interface supported
by the qmi-wwan driver.  Furthermore, the serial ports do not support
modem control signals.  Add driver_info flags to reflect this.

Signed-off-by: default avatarMans Rullgard <mans@mansr.com>
Fixes: ec0cd94d ("usb: option: add SIMCom SIM5218")
Cc: stable <stable@vger.kernel.org>	# 3.2
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 079d7d8e

drivers/usb/serial/option.c

+2 −1
Original line number Diff line number Diff line
@@ -1069,7 +1069,8 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(3) },

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */

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

	/* Quectel products using Qualcomm vendor ID */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),