| From | Greg Kroah-Hartman <> | Subject | [PATCH 4.10 56/81] xhci: Set URB actual length for stopped control transfers | Date | Thu, 6 Apr 2017 10:38:48 +0200 |
| |
4.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Nyman <mathias.nyman@linux.intel.com>
commit 0ab2881a406b9fd46224a3e8253bbc0141b4f844 upstream.
A control transfer that stopped at the status stage incorrectly warned about a "unexpected TRB Type 4", and did not set the transferred actual_length for the URB.
The URB actual_length for control transfers should contain the bytes transferred in the data stage.
Bytes of a partially sent setup stage and missing bytes from status stage should be left out.
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- drivers/usb/host/xhci-ring.c | 3 +++ 1 file changed, 3 insertions(+)
--- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -2000,6 +2000,9 @@ static int process_ctrl_td(struct xhci_h case TRB_NORMAL: td->urb->actual_length = requested - remaining; goto finish_td; + case TRB_STATUS: + td->urb->actual_length = requested; + goto finish_td; default: xhci_warn(xhci, "WARN: unexpected TRB Type %d\n", trb_type);
|