Commit 9cf00d91 authored Jan 31, 2014 by Sarah Sharp

Revert "xhci: Avoid infinite loop when sg urb requires too many trbs"



This reverts commit d6c9ea90.

We are ripping out commit 35773dac "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>
Cc: stable@vger.kernel.org # 3.12

parent 1386ff75

drivers/usb/host/xhci-ring.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3002,7 +3002,7 @@ static int prepare_ring(struct xhci_hcd xhci, struct xhci_ring ep_ring,
	if (num_trbs >= TRBS_PER_SEGMENT) {		if (num_trbs >= TRBS_PER_SEGMENT) {
	xhci_err(xhci, "Too many fragments %d, max %d\n",		xhci_err(xhci, "Too many fragments %d, max %d\n",
	num_trbs, TRBS_PER_SEGMENT - 1);		num_trbs, TRBS_PER_SEGMENT - 1);
	return -EINVAL;		return -ENOMEM;
	}		}

	nop_cmd = cpu_to_le32(TRB_TYPE(TRB_TR_NOOP) \|		nop_cmd = cpu_to_le32(TRB_TYPE(TRB_TR_NOOP) \|