Commit 9c7c3546 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: (25 commits)
  USB: net: asix: add support for Cables-to-Go USB Ethernet adapter
  USB: gadget: cdc-acm deadlock fix
  USB: EHCI: fix divide-by-zero bug
  USB: EHCI: fix handling of dead controllers
  usb: r8a66597-hcd: fix wrong data access in SuperH on-chip USB
  ub: stub pre_reset and post_reset to fix oops
  USB: SISUSB2VGA driver: add 0x0711, 0x0903
  usb: unusual devs patch for Nokia 7610 Supernova
  USB: remove optional bus bindings in isp1760, fixing runtime warning
  + usb-serial-cp2101-add-enfora-gsm2228.patch added to -mm tree
  USB: storage: adjust comment in Kconfig
  USB: Fix PS3 USB shutdown problems
  USB: unusual_devs entry for Argosy USB mass-storage interface
  USB: cdc-acm.c: fix recursive lock in acm_start_wb error path
  USB: CP2101 Add device ID for AMB2560
  USB: mention URB_FREE_BUFFER in usb_free_urb documentation
  USB: Add YISO u893 usb modem vendor and product IDs to option driver
  usb: musb: fix BULK request on different available endpoints
  usb: musb: fix debug global variable name
  usb: musb: Removes compilation warning in gadget mode
  ...
parents 7e5b95f1 ccf95402

drivers/block/ub.c

+18 −2
Original line number Diff line number Diff line
@@ -1546,8 +1546,6 @@ static void ub_top_sense_done(struct ub_dev *sc, struct ub_scsi_cmd *scmd) 


/*

 * Reset management

 * XXX Move usb_reset_device to khubd. Hogging kevent is not a good thing.

 * XXX Make usb_sync_reset asynchronous.

 */



static void ub_reset_enter(struct ub_dev *sc, int try)
@@ -1632,6 +1630,22 @@ static void ub_reset_task(struct work_struct *work) 
	spin_unlock_irqrestore(sc->lock, flags);

}



/*

 * XXX Reset brackets are too much hassle to implement, so just stub them

 * in order to prevent forced unbinding (which deadlocks solid when our

 * ->disconnect method waits for the reset to complete and this kills keventd).

 *

 * XXX Tell Alan to move usb_unlock_device inside of usb_reset_device,

 * or else the post_reset is invoked, and restats I/O on a locked device.

 */

static int ub_pre_reset(struct usb_interface *iface) {

	return 0;

}



static int ub_post_reset(struct usb_interface *iface) {

	return 0;

}



/*

 * This is called from a process context.

 */
@@ -2446,6 +2460,8 @@ static struct usb_driver ub_driver = { 
	.probe =	ub_probe,

	.disconnect =	ub_disconnect,

	.id_table =	ub_usb_ids,

	.pre_reset =	ub_pre_reset,

	.post_reset =	ub_post_reset,

};



static int __init ub_init(void)

drivers/net/usb/asix.c

+4 −0
Original line number Diff line number Diff line
@@ -1444,6 +1444,10 @@ static const struct usb_device_id products [] = { 
	// Apple USB Ethernet Adapter

	USB_DEVICE(0x05ac, 0x1402),

	.driver_info = (unsigned long) &ax88772_info,

}, {

	// Cables-to-Go USB Ethernet Adapter

	USB_DEVICE(0x0b95, 0x772a),

	.driver_info = (unsigned long) &ax88772_info,

},

	{ },		// END

};

drivers/usb/class/cdc-acm.c

+4 −5
Original line number Diff line number Diff line
@@ -158,16 +158,12 @@ static int acm_wb_is_avail(struct acm *acm) 
}



/*

 * Finish write.

 * Finish write. Caller must hold acm->write_lock

 */

static void acm_write_done(struct acm *acm, struct acm_wb *wb)

{

	unsigned long flags;



	spin_lock_irqsave(&acm->write_lock, flags);

	wb->use = 0;

	acm->transmitting--;

	spin_unlock_irqrestore(&acm->write_lock, flags);

}



/*
@@ -482,6 +478,7 @@ static void acm_write_bulk(struct urb *urb) 
{

	struct acm_wb *wb = urb->context;

	struct acm *acm = wb->instance;

	unsigned long flags;



	if (verbose || urb->status

			|| (urb->actual_length != urb->transfer_buffer_length))
@@ -490,7 +487,9 @@ static void acm_write_bulk(struct urb *urb) 
			urb->transfer_buffer_length,

			urb->status);



	spin_lock_irqsave(&acm->write_lock, flags);

	acm_write_done(acm, wb);

	spin_unlock_irqrestore(&acm->write_lock, flags);

	if (ACM_READY(acm))

		schedule_work(&acm->work);

	else

drivers/usb/core/message.c

+1 −0
Original line number Diff line number Diff line
@@ -1091,6 +1091,7 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0) 
				continue;

			dev_dbg(&dev->dev, "unregistering interface %s\n",

				dev_name(&interface->dev));

			interface->unregistering = 1;

			usb_remove_sysfs_intf_files(interface);

			device_del(&interface->dev);

		}

drivers/usb/core/sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ int usb_create_sysfs_intf_files(struct usb_interface *intf) 
	struct usb_host_interface *alt = intf->cur_altsetting;

	int retval;



	if (intf->sysfs_files_created)

	if (intf->sysfs_files_created || intf->unregistering)

		return 0;



	/* The interface string may be present in some altsettings

CRA Git | Maintained and supported by SUSTech CRA and CCSE