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

Commit 1076bb40 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: remove broken usb-serial num_endpoints check
  USB: option: Add new vendor ID and device ID for AMOI HSDPA modem
  USB: support more Huawei data card product IDs
  USB: option.c: add more device IDs
  USB: Obscure Maxon BP3-USB Device Support 16d8:6280 for option driver
parents b4b8f579 07c3b1a1

drivers/usb/serial/option.c

+54 −2
Original line number Diff line number Diff line
@@ -109,6 +109,22 @@ static int option_send_setup(struct usb_serial_port *port); 
#define HUAWEI_PRODUCT_E600			0x1001

#define HUAWEI_PRODUCT_E220			0x1003

#define HUAWEI_PRODUCT_E220BIS			0x1004

#define HUAWEI_PRODUCT_E1401			0x1401

#define HUAWEI_PRODUCT_E1403			0x1403

#define HUAWEI_PRODUCT_E1405			0x1405

#define HUAWEI_PRODUCT_E1406			0x1406

#define HUAWEI_PRODUCT_E1408			0x1408

#define HUAWEI_PRODUCT_E1409			0x1409

#define HUAWEI_PRODUCT_E1410			0x1410

#define HUAWEI_PRODUCT_E1411			0x1411

#define HUAWEI_PRODUCT_E1412			0x1412

#define HUAWEI_PRODUCT_E1413			0x1413

#define HUAWEI_PRODUCT_E1414			0x1414

#define HUAWEI_PRODUCT_E1415			0x1415

#define HUAWEI_PRODUCT_E1416			0x1416

#define HUAWEI_PRODUCT_E1417			0x1417

#define HUAWEI_PRODUCT_E1418			0x1418

#define HUAWEI_PRODUCT_E1419			0x1419



#define NOVATELWIRELESS_VENDOR_ID		0x1410
@@ -129,6 +145,7 @@ static int option_send_setup(struct usb_serial_port *port); 
#define NOVATELWIRELESS_PRODUCT_EV620		0x2100

#define NOVATELWIRELESS_PRODUCT_ES720		0x2110

#define NOVATELWIRELESS_PRODUCT_E725		0x2120

#define NOVATELWIRELESS_PRODUCT_ES620		0x2130

#define NOVATELWIRELESS_PRODUCT_EU730		0x2400

#define NOVATELWIRELESS_PRODUCT_EU740		0x2410

#define NOVATELWIRELESS_PRODUCT_EU870D		0x2420
@@ -137,6 +154,8 @@ static int option_send_setup(struct usb_serial_port *port); 
#define NOVATELWIRELESS_PRODUCT_MC727		0x4100

#define NOVATELWIRELESS_PRODUCT_MC950D		0x4400



#define NOVATELWIRELESS_PRODUCT_U727		0x5010



/* FUTURE NOVATEL PRODUCTS */

#define NOVATELWIRELESS_PRODUCT_EVDO_1		0x6000

#define NOVATELWIRELESS_PRODUCT_HSPA_1		0x7000
@@ -147,6 +166,12 @@ static int option_send_setup(struct usb_serial_port *port); 
#define NOVATELWIRELESS_PRODUCT_EMBEDDED_2	0x8001

#define NOVATELWIRELESS_PRODUCT_GLOBAL_2	0x9001



/* AMOI PRODUCTS */

#define AMOI_VENDOR_ID				0x1614

#define AMOI_PRODUCT_H01			0x0800

#define AMOI_PRODUCT_H01A			0x7002

#define AMOI_PRODUCT_H02			0x0802



#define DELL_VENDOR_ID				0x413C



#define KYOCERA_VENDOR_ID			0x0c88
@@ -163,8 +188,13 @@ static int option_send_setup(struct usb_serial_port *port); 
#define BANDRICH_PRODUCT_C100_1			0x1002

#define BANDRICH_PRODUCT_C100_2			0x1003



#define AMOI_VENDOR_ID			0x1614

#define AMOI_PRODUCT_9508			0x0800



#define QUALCOMM_VENDOR_ID			0x05C6



#define MAXON_VENDOR_ID				0x16d8



static struct usb_device_id option_ids[] = {

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -204,6 +234,23 @@ static struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1401) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1403) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1405) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1406) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1408) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1409) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1410) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1411) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1412) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1413) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1414) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1415) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1416) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1417) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1418) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1419) },

	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) },

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) }, /* Novatel Merlin EX720/V740/X720 */
@@ -216,13 +263,13 @@ static struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EV620) }, /* Novatel EV620/ES620 CDMA/EV-DO */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES720) }, /* Novatel ES620/ES720/U720/USB720 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E725) }, /* Novatel E725/E726 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2130) }, /* Novatel Merlin ES620 SM Bus */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES620) }, /* Novatel Merlin ES620 SM Bus */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU730) }, /* Novatel EU730 and Vodafone EU740 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU740) }, /* Novatel non-Vodafone EU740 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x5010) }, /* Novatel U727 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U727) }, /* Novatel U727 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_1) }, /* Novatel EVDO product */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_1) }, /* Novatel HSPA product */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_1) }, /* Novatel Embedded product */
@@ -232,6 +279,10 @@ static struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_2) }, /* Novatel Embedded product */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL_2) }, /* Novatel Global product */



	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) },

	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) },

	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H02) },



	{ USB_DEVICE(DELL_VENDOR_ID, 0x8114) },	/* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */

	{ USB_DEVICE(DELL_VENDOR_ID, 0x8115) },	/* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */

	{ USB_DEVICE(DELL_VENDOR_ID, 0x8116) },	/* Dell Wireless 5505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
@@ -249,6 +300,7 @@ static struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },

	{ USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */

	{ USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */

	{ } /* Terminating entry */

};

MODULE_DEVICE_TABLE(usb, option_ids);

drivers/usb/serial/usb-serial.c

+2 −0
Original line number Diff line number Diff line
@@ -854,6 +854,7 @@ int usb_serial_probe(struct usb_interface *interface, 
	serial->num_interrupt_in = num_interrupt_in;

	serial->num_interrupt_out = num_interrupt_out;



#if 0

	/* check that the device meets the driver's requirements */

	if ((type->num_interrupt_in != NUM_DONT_CARE &&

				type->num_interrupt_in != num_interrupt_in)
@@ -867,6 +868,7 @@ int usb_serial_probe(struct usb_interface *interface, 
		kfree(serial);

		return -EIO;

	}

#endif



	/* found all that we need */

	dev_info(&interface->dev, "%s converter detected\n",

drivers/usb/storage/unusual_devs.h

+92 −4
Original line number Diff line number Diff line
@@ -1530,16 +1530,104 @@ UNUSUAL_DEV( 0x1210, 0x0003, 0x0100, 0x0100, 
		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_IGNORE_RESIDUE ),



/* Reported by fangxiaozhi <fangxiaozhi60675@huawei.com>

 * and by linlei <linlei83@huawei.com>

 * Patch reworked by Johann Wilhelm <johann.wilhelm@student.tugraz.at>

 * This brings the HUAWEI E220 devices into multi-port mode

/* Reported by fangxiaozhi <huananhu@huawei.com>

 * This brings the HUAWEI data card devices into multi-port mode

 */

UNUSUAL_DEV( 0x12d1, 0x1001, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1003, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1004, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1401, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1403, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1405, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1406, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1408, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1409, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1410, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1411, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1412, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1413, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1414, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1415, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1416, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1417, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1418, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),

UNUSUAL_DEV( 0x12d1, 0x1419, 0x0000, 0x0000,

		"HUAWEI MOBILE",

		"Mass Storage",

		US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,

		0),



/* Reported by Vilius Bilinkevicius <vilisas AT xxx DOT lt) */

UNUSUAL_DEV(  0x132b, 0x000b, 0x0001, 0x0001,