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

Commit 8ff10bdb authored by Schemmel Hans-Christoph's avatar Schemmel Hans-Christoph Committed by Greg Kroah-Hartman
Browse files

USB: Blacklisted Cinterion's PLxx WWAN Interface 



/drivers/usb/serial/option.c: Blacklisted Cinterion's PLxx WWAN
Interface (USB Interface 4), because it will be handled by QMI WWAN
driver. Product IDs renamed.

Signed-off-by: default avatarHans-Christoph Schemmel <hans-christoph.schemmel@gemalto.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 73c042df

drivers/usb/serial/option.c

+5 −4
Original line number Diff line number Diff line
@@ -341,8 +341,8 @@ static void option_instat_callback(struct urb *urb); 
#define CINTERION_PRODUCT_EU3_E			0x0051

#define CINTERION_PRODUCT_EU3_P			0x0052

#define CINTERION_PRODUCT_PH8			0x0053

#define CINTERION_PRODUCT_AH6			0x0055

#define CINTERION_PRODUCT_PLS8			0x0060

#define CINTERION_PRODUCT_AHXX			0x0055

#define CINTERION_PRODUCT_PLXX			0x0060



/* Olivetti products */

#define OLIVETTI_VENDOR_ID			0x0b3c
@@ -1266,8 +1266,9 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_E) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_P) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AH6) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PLS8) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PLXX),

		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, 

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },

	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDM) },