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

Commit 2695cf41 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: (23 commits)
  USB Elan FTDI: check for workqueue creation
  USB: fix spinlock recursion in cdc-acm.c
  USB: fix Unaligned access in EHCI driver
  USB: Product ID for FT232RL in ftdi_sio
  USBNET: DM9501: Add Corega FEther USB-TXC support.
  USB: ipaq.c: Additional devices
  USB: further fix for usb-serial
  USB: fix usb-serial device naming bug
  USB: RTS/DTR signal patch for airprime driver
  USB: ftdi_sio: use port_probe / port_remove thereby fixing access to the latency_timer
  usb-serial: fix shutdown / device_unregister order
  USB: add Additional PIDs in ftdi_sio
  USB: add QL355P power supply ids to fdti_sio
  USB: New device IDs for cp2101 driver
  USB: kill dead code from hub.c
  USB: ratelimit debounce error messages
  USB: pxa2xx_udc: fix hardcoded irq number
  UHCI: fix port resume problem
  USB: set the correct interval for interrupt URBs
  USB: goku_udc: Remove crude cache coherency code
  ...
parents 63e34ca9 ee17b289

drivers/usb/class/cdc-acm.c

+4 −4
Original line number Diff line number Diff line
@@ -332,9 +332,9 @@ static void acm_rx_tasklet(unsigned long _acm) 
	if (!ACM_READY(acm))

		return;



	spin_lock(&acm->throttle_lock);

	spin_lock_irqsave(&acm->throttle_lock, flags);

	throttled = acm->throttle;

	spin_unlock(&acm->throttle_lock);

	spin_unlock_irqrestore(&acm->throttle_lock, flags);

	if (throttled)

		return;
@@ -352,9 +352,9 @@ static void acm_rx_tasklet(unsigned long _acm) 
	dbg("acm_rx_tasklet: procesing buf 0x%p, size = %d", buf, buf->size);



	tty_buffer_request_room(tty, buf->size);

	spin_lock(&acm->throttle_lock);

	spin_lock_irqsave(&acm->throttle_lock, flags);

	throttled = acm->throttle;

	spin_unlock(&acm->throttle_lock);

	spin_unlock_irqrestore(&acm->throttle_lock, flags);

	if (!throttled)

		tty_insert_flip_string(tty, buf->base, buf->size);

	tty_flip_buffer_push(tty);

drivers/usb/core/devio.c

+6 −7
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb, 
	struct async *as;

	struct usb_ctrlrequest *dr = NULL;

	unsigned int u, totlen, isofrmlen;

	int ret, interval = 0, ifnum = -1;

	int ret, ifnum = -1;



	if (uurb->flags & ~(USBDEVFS_URB_ISO_ASAP|USBDEVFS_URB_SHORT_NOT_OK|

			   URB_NO_FSBR|URB_ZERO_PACKET))
@@ -992,7 +992,6 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb, 
		if ((ep->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)

				!= USB_ENDPOINT_XFER_ISOC)

			return -EINVAL;

		interval = 1 << min (15, ep->desc.bInterval - 1);

		isofrmlen = sizeof(struct usbdevfs_iso_packet_desc) * uurb->number_of_packets;

		if (!(isopkt = kmalloc(isofrmlen, GFP_KERNEL)))

			return -ENOMEM;
@@ -1021,10 +1020,6 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb, 
		if ((ep->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)

				!= USB_ENDPOINT_XFER_INT)

			return -EINVAL;

		if (ps->dev->speed == USB_SPEED_HIGH)

			interval = 1 << min (15, ep->desc.bInterval - 1);

		else

			interval = ep->desc.bInterval;

		if (uurb->buffer_length > MAX_USBFS_BUFFER_SIZE)

			return -EINVAL;

		if (!access_ok((uurb->endpoint & USB_DIR_IN) ? VERIFY_WRITE : VERIFY_READ, uurb->buffer, uurb->buffer_length))
@@ -1053,7 +1048,11 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb, 
	as->urb->setup_packet = (unsigned char*)dr;

	as->urb->start_frame = uurb->start_frame;

	as->urb->number_of_packets = uurb->number_of_packets;

	as->urb->interval = interval;

	if (uurb->type == USBDEVFS_URB_TYPE_ISO ||

			ps->dev->speed == USB_SPEED_HIGH)

		as->urb->interval = 1 << min(15, ep->desc.bInterval - 1);

	else

		as->urb->interval = ep->desc.bInterval;

        as->urb->context = as;

        as->urb->complete = async_completed;

	for (totlen = u = 0; u < uurb->number_of_packets; u++) {

drivers/usb/core/hub.c

+1 −8
Original line number Diff line number Diff line
@@ -1281,12 +1281,6 @@ int usb_new_device(struct usb_device *udev) 
{

	int err;



	/* Lock ourself into memory in order to keep a probe sequence

	 * sleeping in a new thread from allowing us to be unloaded.

	 */

	if (!try_module_get(THIS_MODULE))

		return -EINVAL;



	/* Determine quirks */

	usb_detect_quirks(udev);
@@ -1390,7 +1384,6 @@ int usb_new_device(struct usb_device *udev) 
		usb_autoresume_device(udev->parent);



exit:

	module_put(THIS_MODULE);

	return err;



fail:
@@ -2443,7 +2436,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, 


	if (portchange & USB_PORT_STAT_C_CONNECTION) {

		status = hub_port_debounce(hub, port1);

		if (status < 0) {

		if (status < 0 && printk_ratelimit()) {

			dev_err (hub_dev,

				"connect-debounce failed, port %d disabled\n",

				port1);

drivers/usb/core/message.c

+7 −2
Original line number Diff line number Diff line
@@ -221,10 +221,15 @@ int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe, 


	if ((ep->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==

			USB_ENDPOINT_XFER_INT) {

		int interval;



		if (usb_dev->speed == USB_SPEED_HIGH)

			interval = 1 << min(15, ep->desc.bInterval - 1);

		else

			interval = ep->desc.bInterval;

		pipe = (pipe & ~(3 << 30)) | (PIPE_INTERRUPT << 30);

		usb_fill_int_urb(urb, usb_dev, pipe, data, len,

				usb_api_blocking_completion, NULL,

				ep->desc.bInterval);

				usb_api_blocking_completion, NULL, interval);

	} else

		usb_fill_bulk_urb(urb, usb_dev, pipe, data, len,

				usb_api_blocking_completion, NULL);

drivers/usb/gadget/at91_udc.c

+3 −3
Original line number Diff line number Diff line
@@ -1835,7 +1835,7 @@ static int at91udc_resume(struct platform_device *pdev) 
#define	at91udc_resume	NULL

#endif



static struct platform_driver at91_udc = {

static struct platform_driver at91_udc_driver = {

	.remove		= __exit_p(at91udc_remove),

	.shutdown	= at91udc_shutdown,

	.suspend	= at91udc_suspend,
@@ -1848,13 +1848,13 @@ static struct platform_driver at91_udc = { 


static int __init udc_init_module(void)

{

	return platform_driver_probe(&at91_udc, at91udc_probe);

	return platform_driver_probe(&at91_udc_driver, at91udc_probe);

}

module_init(udc_init_module);



static void __exit udc_exit_module(void)

{

	platform_driver_unregister(&at91_udc);

	platform_driver_unregister(&at91_udc_driver);

}

module_exit(udc_exit_module);