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

Commit 8ecd93ab authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-3.16-rc3' of... 

Merge tag 'usb-serial-3.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-linus

Johan writes:

USB-serial fixes for v3.16-rc3

Here are some USB-serial updates for v3.16-rc3 that fix a reported
NULL-pointer dereference and add some new device IDs.

Included is also two changes to MAINTAINERS dropping individual
maintainership for two small sub-drivers and updating an email address.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents d6236f6d 66085694

MAINTAINERS

+1 −13
Original line number Diff line number Diff line
@@ -9410,12 +9410,6 @@ S: Maintained 
F:	drivers/usb/host/isp116x*

F:	include/linux/usb/isp116x.h



USB KAWASAKI LSI DRIVER

M:	Oliver Neukum <oliver@neukum.org>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/serial/kl5kusb105.*



USB MASS STORAGE DRIVER

M:	Matthew Dharm <mdharm-usb@one-eyed-alien.net>

L:	linux-usb@vger.kernel.org
@@ -9443,12 +9437,6 @@ S: Maintained 
F:	Documentation/usb/ohci.txt

F:	drivers/usb/host/ohci*



USB OPTION-CARD DRIVER

M:	Matthias Urlichs <smurf@smurf.noris.de>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/serial/option.c



USB PEGASUS DRIVER

M:	Petko Manolov <petkan@nucleusys.com>

L:	linux-usb@vger.kernel.org
@@ -9481,7 +9469,7 @@ S: Maintained 
F:	drivers/net/usb/rtl8150.c



USB SERIAL SUBSYSTEM

M:	Johan Hovold <jhovold@gmail.com>

M:	Johan Hovold <johan@kernel.org>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	Documentation/usb/usb-serial.txt

drivers/usb/serial/ftdi_sio.c

+5 −2
Original line number Diff line number Diff line
@@ -1566,14 +1566,17 @@ static void ftdi_set_max_packet_size(struct usb_serial_port *port) 
	struct usb_device *udev = serial->dev;



	struct usb_interface *interface = serial->interface;

	struct usb_endpoint_descriptor *ep_desc = &interface->cur_altsetting->endpoint[1].desc;

	struct usb_endpoint_descriptor *ep_desc;



	unsigned num_endpoints;

	int i;

	unsigned i;



	num_endpoints = interface->cur_altsetting->desc.bNumEndpoints;

	dev_info(&udev->dev, "Number of endpoints %d\n", num_endpoints);



	if (!num_endpoints)

		return;



	/* NOTE: some customers have programmed FT232R/FT245R devices

	 * with an endpoint size of 0 - not good.  In this case, we

	 * want to override the endpoint descriptor setting and use a

drivers/usb/serial/option.c

+20 −6
Original line number Diff line number Diff line
@@ -352,6 +352,9 @@ static void option_instat_callback(struct urb *urb); 
/* Zoom */

#define ZOOM_PRODUCT_4597			0x9607



/* SpeedUp SU9800 usb 3g modem */

#define SPEEDUP_PRODUCT_SU9800			0x9800



/* Haier products */

#define HAIER_VENDOR_ID				0x201e

#define HAIER_PRODUCT_CE100			0x2009
@@ -372,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 */
@@ -1577,6 +1584,7 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),

  	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist

  	},

	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) },

	{ USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) },

	{ USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) },

	{ USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },
@@ -1611,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) },