Commit 3d07984b authored by David Ward's avatar David Ward Committed by Johan Hovold
Browse files

Revert "USB: qcserial/option: make AT URCs work for Sierra Wireless MC7305/MC7355" 



This reverts commit 653cdc13.

The qcserial driver now enables the SET_CONTROL_LINE_STATE request
so that AT URCs will work. Move these devices back to the qcserial
driver, which is used for other devices in this series that follow
the same layout.

Cc: Bjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarDavid Ward <david.ward@ll.mit.edu>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent efd3e915

drivers/usb/serial/option.c

+0 −2
Original line number Diff line number Diff line
@@ -1114,8 +1114,6 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */

	{ USB_DEVICE_INTERFACE_CLASS(SIERRA_VENDOR_ID, 0x68c0, 0xff),

	  .driver_info = (kernel_ulong_t)&sierra_mc73xx_blacklist }, /* MC73xx */

	{ USB_DEVICE_INTERFACE_CLASS(SIERRA_VENDOR_ID, 0x9041, 0xff),

	  .driver_info = (kernel_ulong_t)&sierra_mc73xx_blacklist }, /* MC7305/MC7355 */

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6003),

drivers/usb/serial/qcserial.c

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ static const struct usb_device_id id_table[] = { 
	{DEVICE_SWI(0x1199, 0x901c)},	/* Sierra Wireless EM7700 */

	{DEVICE_SWI(0x1199, 0x901f)},	/* Sierra Wireless EM7355 */

	{DEVICE_SWI(0x1199, 0x9040)},	/* Sierra Wireless Modem */

	{DEVICE_SWI(0x1199, 0x9041)},	/* Sierra Wireless MC7305/MC7355 */

	{DEVICE_SWI(0x1199, 0x9051)},	/* Netgear AirCard 340U */

	{DEVICE_SWI(0x1199, 0x9053)},	/* Sierra Wireless Modem */

	{DEVICE_SWI(0x1199, 0x9054)},	/* Sierra Wireless Modem */

CRA Git | Maintained and supported by SUSTech CRA and CCSE