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

Commit a9cf7cd0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: new Novatel device ids for option driver
  USB: berry_charge: correct dbg string for second magic command
  usblp: quirk flag and device entry for Seiko Epson M129C printer
  airprime: USB ID for Novatel EV620 mini PCI-E card
  USB: necessary update for mos7720 driver
  USB: RAZR v3i unusual_devs
  USB: two more device ids for dm9601 usbnet driver
  USB: fix usb-serial regression
parents 62b6e9ff 69806d56

drivers/usb/class/usblp.c

+5 −1
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ struct quirk_printer_struct { 


#define USBLP_QUIRK_BIDIR	0x1	/* reports bidir but requires unidirectional mode (no INs/reads) */

#define USBLP_QUIRK_USB_INIT	0x2	/* needs vendor USB init string */

#define USBLP_QUIRK_BAD_CLASS	0x4	/* descriptor uses vendor-specific Class or SubClass */



static const struct quirk_printer_struct quirk_printers[] = {

	{ 0x03f0, 0x0004, USBLP_QUIRK_BIDIR }, /* HP DeskJet 895C */
@@ -218,6 +219,7 @@ static const struct quirk_printer_struct quirk_printers[] = { 
	{ 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */

	{ 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */

	{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */

	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt Printer M129C */

	{ 0, 0 }

};
@@ -1048,6 +1050,7 @@ static int usblp_select_alts(struct usblp *usblp) 
		ifd = &if_alt->altsetting[i];



		if (ifd->desc.bInterfaceClass != 7 || ifd->desc.bInterfaceSubClass != 1)

			if (!(usblp->quirks & USBLP_QUIRK_BAD_CLASS))

				continue;



		if (ifd->desc.bInterfaceProtocol < USBLP_FIRST_PROTOCOL ||
@@ -1232,6 +1235,7 @@ static struct usb_device_id usblp_ids [] = { 
	{ USB_INTERFACE_INFO(7, 1, 1) },

	{ USB_INTERFACE_INFO(7, 1, 2) },

	{ USB_INTERFACE_INFO(7, 1, 3) },

	{ USB_DEVICE(0x04b8, 0x0202) },	/* Seiko Epson Receipt Printer M129C */

	{ }						/* Terminating entry */

};

drivers/usb/misc/berry_charge.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int magic_charge(struct usb_device *udev) 
		return retval;

	}



	dbg(&udev->dev, "Sending first magic command\n");

	dbg(&udev->dev, "Sending second magic command\n");

	retval = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),

				 0xa2, 0x40, 0, 1, dummy_buffer, 0, 100);

	if (retval != 0) {

drivers/usb/net/dm9601.c

+8 −0
Original line number Diff line number Diff line
@@ -578,6 +578,14 @@ static const struct usb_device_id products[] = { 
	 USB_DEVICE(0x0a46, 0x9601),	/* Davicom USB-100 */

	 .driver_info = (unsigned long)&dm9601_info,

	 },

	{

	 USB_DEVICE(0x0a46, 0x6688),	/* ZT6688 USB NIC */

	 .driver_info = (unsigned long)&dm9601_info,

	 },

	{

	 USB_DEVICE(0x0a46, 0x0268),	/* ShanTou ST268 USB NIC */

	 .driver_info = (unsigned long)&dm9601_info,

	 },

	{},			// END

};

drivers/usb/serial/airprime.c

+0 −4
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ 


static struct usb_device_id id_table [] = {

	{ USB_DEVICE(0x0c88, 0x17da) }, /* Kyocera Wireless KPC650/Passport */

	{ USB_DEVICE(0x1410, 0x1110) }, /* Novatel Wireless Merlin CDMA */

	{ USB_DEVICE(0x1410, 0x1130) }, /* Novatel Wireless S720 CDMA/EV-DO */

	{ USB_DEVICE(0x1410, 0x2110) }, /* Novatel Wireless U720 CDMA/EV-DO */

	{ USB_DEVICE(0x1410, 0x1430) },	/* Novatel Merlin XU870 HSDPA/3G */

	{ USB_DEVICE(0x1410, 0x1100) }, /* ExpressCard34 Qualcomm 3G CDMA */

	{ USB_DEVICE(0x413c, 0x8115) }, /* Dell Wireless HSDPA 5500 */

	{ },

drivers/usb/serial/mos7720.c

+1 −0
Original line number Diff line number Diff line
@@ -1628,6 +1628,7 @@ static struct usb_serial_driver moschip7720_2port_driver = { 
	.chars_in_buffer	= mos7720_chars_in_buffer,

	.break_ctl		= mos7720_break,

	.read_bulk_callback	= mos7720_bulk_in_callback,

	.read_int_callback	= mos7720_interrupt_callback,

};



static int __init moschip7720_init(void)