Commit 99dbe109 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: storage: Unusual USB device Prolific 2507 variation added
  USB: Add device id for Option GTM380 to option driver
  USB: Add Vendor/Product ID for new CDMA U727 to option driver
  USB: Updated unusual-devs entry for USB mass storage on Nokia 6233
  USB: Option: let cdc-acm handle Sony Ericsson F3507g / Dell 5530
  USB: EHCI: expedite unlinks when the root hub is suspended
  USB: EHCI: Fix isochronous URB leak
  USB: option.c: add ZTE 622 modem device
  USB: wusbcore/wa-xfer, fix lock imbalance
  USB: misc/vstusb, fix lock imbalance
  USB: misc/adutux, fix lock imbalance
  USB: image/mdc800, fix lock imbalance
  USB: atm/cxacru, fix lock imbalance
  USB: unusual_devs: Add support for GI 0431 SD-Card interface
  USB: serial: new cp2101 device id
  USB: serial: ftdi: enable UART detection on gnICE JTAG adaptors blacklist interface0
  USB: serial: add FTDI USB/Serial converter devices
  USB: usbfs: keep async URBs until the device file is closed
  USB: usbtmc: add protocol 1 support
  USB: usbtmc: fix stupid bug in open()
parents bd27e6d3 8a0845c5

drivers/usb/atm/cxacru.c

+2 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ static int cxacru_cm(struct cxacru_data *instance, enum cxacru_cm_request cm, 
			usb_err(instance->usbatm, "requested transfer size too large (%d, %d)\n",

				wbuflen, rbuflen);

		ret = -ENOMEM;

		goto fail;

		goto err;

	}



	mutex_lock(&instance->cm_serialize);
@@ -565,6 +565,7 @@ static int cxacru_cm(struct cxacru_data *instance, enum cxacru_cm_request cm, 
	dbg("cm %#x", cm);

fail:

	mutex_unlock(&instance->cm_serialize);

err:

	return ret;

}

drivers/usb/class/usbtmc.c

+3 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 


static struct usb_device_id usbtmc_devices[] = {

	{ USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 0), },

	{ USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 1), },

	{ 0, } /* terminating entry */

};

MODULE_DEVICE_TABLE(usb, usbtmc_devices);
@@ -106,12 +107,13 @@ static int usbtmc_open(struct inode *inode, struct file *filp) 
{

	struct usb_interface *intf;

	struct usbtmc_device_data *data;

	int retval = -ENODEV;

	int retval = 0;



	intf = usb_find_interface(&usbtmc_driver, iminor(inode));

	if (!intf) {

		printk(KERN_ERR KBUILD_MODNAME

		       ": can not find device for minor %d", iminor(inode));

		retval = -ENODEV;

		goto exit;

	}

drivers/usb/core/devio.c

+7 −5
Original line number Diff line number Diff line
@@ -359,11 +359,6 @@ static void destroy_async(struct dev_state *ps, struct list_head *list) 
		spin_lock_irqsave(&ps->lock, flags);

	}

	spin_unlock_irqrestore(&ps->lock, flags);

	as = async_getcompleted(ps);

	while (as) {

		free_async(as);

		as = async_getcompleted(ps);

	}

}



static void destroy_async_on_interface(struct dev_state *ps,
@@ -643,6 +638,7 @@ static int usbdev_release(struct inode *inode, struct file *file) 
	struct dev_state *ps = file->private_data;

	struct usb_device *dev = ps->dev;

	unsigned int ifnum;

	struct async *as;



	usb_lock_device(dev);
@@ -661,6 +657,12 @@ static int usbdev_release(struct inode *inode, struct file *file) 
	usb_unlock_device(dev);

	usb_put_dev(dev);

	put_pid(ps->disc_pid);



	as = async_getcompleted(ps);

	while (as) {

		free_async(as);

		as = async_getcompleted(ps);

	}

	kfree(ps);

	return 0;

}

drivers/usb/host/ehci-q.c

+2 −1
Original line number Diff line number Diff line
@@ -1095,7 +1095,8 @@ static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh) 
	prev->qh_next = qh->qh_next;

	wmb ();



	if (unlikely (ehci_to_hcd(ehci)->state == HC_STATE_HALT)) {

	/* If the controller isn't running, we don't have to wait for it */

	if (unlikely(!HC_IS_RUNNING(ehci_to_hcd(ehci)->state))) {

		/* if (unlikely (qh->reclaim != 0))

		 *	this will recurse, probably not much

		 */

drivers/usb/host/ehci-sched.c

+4 −6
Original line number Diff line number Diff line
@@ -1536,7 +1536,7 @@ itd_link_urb ( 
					struct ehci_itd, itd_list);

			list_move_tail (&itd->itd_list, &stream->td_list);

			itd->stream = iso_stream_get (stream);

			itd->urb = usb_get_urb (urb);

			itd->urb = urb;

			itd_init (ehci, stream, itd);

		}
@@ -1645,7 +1645,7 @@ itd_complete ( 
	(void) disable_periodic(ehci);

	ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;



	if (unlikely (list_empty (&stream->td_list))) {

	if (unlikely(list_is_singular(&stream->td_list))) {

		ehci_to_hcd(ehci)->self.bandwidth_allocated

				-= stream->bandwidth;

		ehci_vdbg (ehci,
@@ -1656,7 +1656,6 @@ itd_complete ( 
	iso_stream_put (ehci, stream);



done:

	usb_put_urb(urb);

	itd->urb = NULL;

	if (ehci->clock_frame != itd->frame || itd->index[7] != -1) {

		/* OK to recycle this ITD now. */
@@ -1949,7 +1948,7 @@ sitd_link_urb ( 
				struct ehci_sitd, sitd_list);

		list_move_tail (&sitd->sitd_list, &stream->td_list);

		sitd->stream = iso_stream_get (stream);

		sitd->urb = usb_get_urb (urb);

		sitd->urb = urb;



		sitd_patch(ehci, stream, sitd, sched, packet);

		sitd_link (ehci, (next_uframe >> 3) % ehci->periodic_size,
@@ -2034,7 +2033,7 @@ sitd_complete ( 
	(void) disable_periodic(ehci);

	ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;



	if (list_empty (&stream->td_list)) {

	if (list_is_singular(&stream->td_list)) {

		ehci_to_hcd(ehci)->self.bandwidth_allocated

				-= stream->bandwidth;

		ehci_vdbg (ehci,
@@ -2045,7 +2044,6 @@ sitd_complete ( 
	iso_stream_put (ehci, stream);

	/* OK to recycle this SITD now that its completion callback ran. */

done:

	usb_put_urb(urb);

	sitd->urb = NULL;

	sitd->stream = NULL;

	list_move(&sitd->sitd_list, &stream->free_list);

CRA Git | Maintained and supported by SUSTech CRA and CCSE