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

Commit b0ebef36 authored by Bjørn Mork's avatar Bjørn Mork Committed by Johan Hovold
Browse files

usb: option: add/modify Olivetti Olicard modems 



Adding a couple of Olivetti modems and blacklisting the net
function on a couple which are already supported.

Reported-by: default avatarLars Melin <larsm17@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent aea1ae87

drivers/usb/serial/option.c

+16 −6
Original line number Diff line number Diff line
@@ -375,8 +375,12 @@ static void option_instat_callback(struct urb *urb); 
/* Olivetti products */

#define OLIVETTI_VENDOR_ID			0x0b3c

#define OLIVETTI_PRODUCT_OLICARD100		0xc000

#define OLIVETTI_PRODUCT_OLICARD120		0xc001

#define OLIVETTI_PRODUCT_OLICARD140		0xc002

#define OLIVETTI_PRODUCT_OLICARD145		0xc003

#define OLIVETTI_PRODUCT_OLICARD155		0xc004

#define OLIVETTI_PRODUCT_OLICARD200		0xc005

#define OLIVETTI_PRODUCT_OLICARD160		0xc00a

#define OLIVETTI_PRODUCT_OLICARD500		0xc00b



/* Celot products */
@@ -1615,15 +1619,21 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDMNET) },

	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, /* HC28 enumerates with Siemens or Cinterion VID depending on FW revision */

	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },



	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },

	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100),

		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },

	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120),

		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },

	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD140),

		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },

	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) },

	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD155),

		.driver_info = (kernel_ulong_t)&net_intf6_blacklist },

	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200),

		.driver_info = (kernel_ulong_t)&net_intf6_blacklist

	},

		.driver_info = (kernel_ulong_t)&net_intf6_blacklist },

	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD160),

		.driver_info = (kernel_ulong_t)&net_intf6_blacklist },

	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD500),

		.driver_info = (kernel_ulong_t)&net_intf4_blacklist

	},

		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },

	{ USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO 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.*/

	{ USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) },