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

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

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

parents 436002e3 34d1a8aa

drivers/usb/gadget/lh7a40x_udc.c

+4 −2
Original line number Diff line number Diff line
@@ -1062,11 +1062,11 @@ static int lh7a40x_ep_enable(struct usb_ep *_ep, 
	ep->pio_irqs = 0;

	ep->ep.maxpacket = le16_to_cpu(desc->wMaxPacketSize);



	spin_unlock_irqrestore(&ep->dev->lock, flags);



	/* Reset halt state (does flush) */

	lh7a40x_set_halt(_ep, 0);



	spin_unlock_irqrestore(&ep->dev->lock, flags);



	DEBUG("%s: enabled %s\n", __FUNCTION__, _ep->name);

	return 0;

}
@@ -1775,6 +1775,7 @@ static void lh7a40x_ep0_setup(struct lh7a40x_udc *dev, u32 csr) 
					break;



				qep = &dev->ep[ep_num];

				spin_unlock(&dev->lock);

				if (ctrl.bRequest == USB_REQ_SET_FEATURE) {

					DEBUG_SETUP("SET_FEATURE (%d)\n",

						    ep_num);
@@ -1784,6 +1785,7 @@ static void lh7a40x_ep0_setup(struct lh7a40x_udc *dev, u32 csr) 
						    ep_num);

					lh7a40x_set_halt(&qep->ep, 0);

				}

				spin_lock(&dev->lock);

				usb_set_index(0);



				/* Reply with a ZLP on next IN token */

drivers/usb/gadget/rndis.c

+7 −4
Original line number Diff line number Diff line
@@ -855,9 +855,12 @@ static int rndis_query_response (int configNr, rndis_query_msg_type *buf) 
	

	/*

	 * we need more memory:

	 * oid_supported_list is the largest answer 

	 * gen_ndis_query_resp expects enough space for

	 * rndis_query_cmplt_type followed by data.

	 * oid_supported_list is the largest data reply

	 */

	r = rndis_add_response (configNr, sizeof (oid_supported_list));

	r = rndis_add_response (configNr,

		sizeof (oid_supported_list) + sizeof(rndis_query_cmplt_type));

	if (!r)

		return -ENOMEM;

	resp = (rndis_query_cmplt_type *) r->buf;

drivers/usb/host/pci-quirks.c

+6 −5
Original line number Diff line number Diff line
@@ -260,12 +260,13 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) 
						offset + EHCI_USBLEGCTLSTS,

						val | EHCI_USBLEGCTLSTS_SOOE);

#endif

			}



			/* always say Linux will own the hardware

			 * by setting EHCI_USBLEGSUP_OS.

				/* some systems get upset if this semaphore is

				 * set for any other reason than forcing a BIOS

				 * handoff..

				 */

				pci_write_config_byte(pdev, offset + 3, 1);

			}



			/* if boot firmware now owns EHCI, spin till

			 * it hands it over.

drivers/usb/input/hid-core.c

+2 −0
Original line number Diff line number Diff line
@@ -1407,6 +1407,7 @@ void hid_init_reports(struct hid_device *hid) 
#define USB_VENDOR_ID_WISEGROUP		0x0925

#define USB_DEVICE_ID_1_PHIDGETSERVO_20	0x8101

#define USB_DEVICE_ID_4_PHIDGETSERVO_20	0x8104

#define USB_DEVICE_ID_DUAL_USB_JOYPAD   0x8866



#define USB_VENDOR_ID_CODEMERCS		0x07c0

#define USB_DEVICE_ID_CODEMERCS_IOW40	0x1500
@@ -1577,6 +1578,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET},

	{ USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },



	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_POWERMOUSE, HID_QUIRK_2WHEEL_POWERMOUSE },

	{ USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 },

drivers/usb/serial/ftdi_sio.c

+6 −0
Original line number Diff line number Diff line
@@ -469,8 +469,14 @@ static struct usb_device_id id_table_combined [] = { 
	{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },

	{ USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_KW_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_YS_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_Y6_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_Y8_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_IC_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_DB9_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_RS232_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_Y9_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_VCP_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_D2XX_PID) },

	{ USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },