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

Commit a4083c92 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: Fix cut-and-paste error in rtl8150.c
  USB: ehci: stop vt6212 bus hogging
  USB: sierra: add another device id
  USB: sierra: dma fixes
  USB: add support for Motorola ROKR Z6 cellphone in mass storage mode
  USB: isd200: fix memory leak in isd200_get_inquiry_data
  USB: pl2303: another product ID
  USB: new quirk flag to avoid Set-Interface
  USB: fix gadgetfs class request delegation
parents 4742dc1d 7fdba2f2

drivers/net/usb/rtl8150.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static int alloc_all_urbs(rtl8150_t * dev) 
		return 0;

	}

	dev->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);

	if (!dev->intr_urb) {

	if (!dev->ctrl_urb) {

		usb_free_urb(dev->rx_urb);

		usb_free_urb(dev->tx_urb);

		usb_free_urb(dev->intr_urb);

drivers/usb/core/message.c

+4 −1
Original line number Diff line number Diff line
@@ -1206,6 +1206,9 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate) 
		return -EINVAL;

	}



	if (dev->quirks & USB_QUIRK_NO_SET_INTF)

		ret = -EPIPE;

	else

		ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),

				   USB_REQ_SET_INTERFACE, USB_RECIP_INTERFACE,

				   alternate, interface, NULL, 0, 5000);

drivers/usb/core/quirks.c

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* M-Systems Flash Disk Pioneers */

	{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },



	/* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */

	{ USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF },



	/* Action Semiconductor flash disk */

	{ USB_DEVICE(0x10d6, 0x2200), .driver_info =

			USB_QUIRK_STRING_FETCH_255 },

drivers/usb/gadget/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -1458,7 +1458,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
	/* currently one config, two speeds */

	case USB_REQ_SET_CONFIGURATION:

		if (ctrl->bRequestType != 0)

			break;

			goto unrecognized;

		if (0 == (u8) w_value) {

			value = 0;

			dev->current_config = 0;
@@ -1505,7 +1505,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
	/* PXA automagically handles this request too */

	case USB_REQ_GET_CONFIGURATION:

		if (ctrl->bRequestType != 0x80)

			break;

			goto unrecognized;

		*(u8 *)req->buf = dev->current_config;

		value = min (w_length, (u16) 1);

		break;

drivers/usb/host/ehci-pci.c

+14 −0
Original line number Diff line number Diff line
@@ -152,6 +152,20 @@ static int ehci_pci_setup(struct usb_hcd *hcd) 
			break;

		}

		break;

	case PCI_VENDOR_ID_VIA:

		if (pdev->device == 0x3104 && (pdev->revision & 0xf0) == 0x60) {

			u8 tmp;



			/* The VT6212 defaults to a 1 usec EHCI sleep time which

			 * hogs the PCI bus *badly*. Setting bit 5 of 0x4B makes

			 * that sleep time use the conventional 10 usec.

			 */

			pci_read_config_byte(pdev, 0x4b, &tmp);

			if (tmp & 0x20)

				break;

			pci_write_config_byte(pdev, 0x4b, tmp | 0x20);

		}

		break;

	}



	ehci_reset(ehci);