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

Commit 15b2f320 authored by Marius B. Kotsbak's avatar Marius B. Kotsbak Committed by Greg Kroah-Hartman
Browse files

Bind only modem AT command endpoint to option module. 



Network interface is handled by upcoming gt_b3730 module.

Removed "GT-B3710" from comment, it is another modem with another USB ID.

Signed-off-by: default avatarMarius B. Kotsbak <marius@kotsbak.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d771d8aa

drivers/usb/serial/option.c

+7 −1
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },

	{ USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */

	{ USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */

	{ USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730/GT-B3710 LTE USB modem.*/

	{ USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/

	{ } /* Terminating entry */

};

MODULE_DEVICE_TABLE(usb, option_ids);
@@ -1109,6 +1109,12 @@ static int option_probe(struct usb_serial *serial, 
		serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)

		return -ENODEV;



	/* Don't bind network interface on Samsung GT-B3730, it is handled by a separate module */

	if (serial->dev->descriptor.idVendor == SAMSUNG_VENDOR_ID &&

		serial->dev->descriptor.idProduct == SAMSUNG_PRODUCT_GT_B3730 &&

		serial->interface->cur_altsetting->desc.bInterfaceClass != USB_CLASS_CDC_DATA)

		return -ENODEV;



	data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL);



	if (!data)