Revert "xhci: Avoid infinite loop when sg urb requires too many trbs"
authorSarah Sharp <sarah.a.sharp@linux.intel.com>
Fri, 31 Jan 2014 19:51:59 +0000 (11:51 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 Feb 2014 21:32:28 +0000 (13:32 -0800)
commitf47a7fb0a06f44707d416b752508d79ce59575e5
tree275f3a0cc1fad2652d0bbd589fe1cf4bed7d0373
parent563f01094b4a1b860521b156f233d7292a7b9d57
Revert "xhci: Avoid infinite loop when sg urb requires too many trbs"

commit 9cf00d91708221ff2d8a11143315f7ebab8d5da8 upstream.

This reverts commit d6c9ea9069af684358efedcaf2f2f687f51c58ee.

We are ripping out commit 35773dac5f862cb1c82ea151eba3e2f6de51ec3e "usb:
xhci: Link TRB must not occur within a USB payload burst" because it's a
hack that caused regressions in the usb-storage and userspace USB
drivers that use usbfs and libusb.  This commit attempted to fix the
issues with that patch.

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/xhci-ring.c