Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ab2881a authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: Set URB actual length for stopped control transfers 



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.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b07c1251

drivers/usb/host/xhci-ring.c

+3 −0
Original line number Diff line number Diff line
@@ -1989,6 +1989,9 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td, 
		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);