From: Sarah Sharp Date: Fri, 31 Jan 2014 19:51:59 +0000 (-0800) Subject: Revert "xhci: Avoid infinite loop when sg urb requires too many trbs" X-Git-Tag: submit/tizen_common/20140905.094502~659 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f47a7fb0a06f44707d416b752508d79ce59575e5;p=sdk%2Femulator%2Femulator-kernel.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index fec3c8654ccd..55fc0c39b7e1 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -2964,7 +2964,7 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring, if (num_trbs >= TRBS_PER_SEGMENT) { xhci_err(xhci, "Too many fragments %d, max %d\n", num_trbs, TRBS_PER_SEGMENT - 1); - return -EINVAL; + return -ENOMEM; } nop_cmd = cpu_to_le32(TRB_TYPE(TRB_TR_NOOP) |