From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Mar 2011 22:04:26 +0000 (-0700)
Subject: Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
X-Git-Tag: v2.6.39-rc1~472
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=971f115a50afbe409825c9f3399d5a3b9aca4381;p=~shefty%2Frdma-dev.git

Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (172 commits)
  USB: Add support for SuperSpeed isoc endpoints
  xhci: Clean up cycle bit math used during stalls.
  xhci: Fix cycle bit calculation during stall handling.
  xhci: Update internal dequeue pointers after stalls.
  USB: Disable auto-suspend for USB 3.0 hubs.
  USB: Remove bogus USB_PORT_STAT_SUPER_SPEED symbol.
  xhci: Return canceled URBs immediately when host is halted.
  xhci: Fixes for suspend/resume of shared HCDs.
  xhci: Fix re-init on power loss after resume.
  xhci: Make roothub functions deal with device removal.
  xhci: Limit roothub ports to 15 USB3 & 31 USB2 ports.
  xhci: Return a USB 3.0 hub descriptor for USB3 roothub.
  xhci: Register second xHCI roothub.
  xhci: Change xhci_find_slot_id_by_port() API.
  xhci: Refactor bus suspend state into a struct.
  xhci: Index with a port array instead of PORTSC addresses.
  USB: Set usb_hcd->state and flags for shared roothubs.
  usb: Make core allocate resources per PCI-device.
  usb: Store bus type in usb_hcd, not in driver flags.
  usb: Change usb_hcd->bandwidth_mutex to a pointer.
  ...
---

971f115a50afbe409825c9f3399d5a3b9aca4381
diff --cc drivers/usb/host/xhci.c
index 2083fc2179b,2c11411ca5f..9a3645fd759
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@@ -473,10 -490,8 +490,8 @@@ int xhci_run(struct usb_hcd *hcd
  			xhci->ir_set, (unsigned int) ER_IRQ_ENABLE(temp));
  	xhci_writel(xhci, ER_IRQ_ENABLE(temp),
  			&xhci->ir_set->irq_pending);
 -	xhci_print_ir_set(xhci, xhci->ir_set, 0);
 +	xhci_print_ir_set(xhci, 0);
  
- 	if (NUM_TEST_NOOPS > 0)
- 		doorbell = xhci_setup_one_noop(xhci);
  	if (xhci->quirks & XHCI_NEC_HOST)
  		xhci_queue_vendor_command(xhci, 0, 0, 0,
  				TRB_TYPE(TRB_NEC_GET_FW));