On Mon, Mar 27, 2017 at 04:58:39PM +0300, Mathias Nyman wrote:
> A control transfer that stopped at the status stage incorrectly
> warned about a "unexpected TRB Type 4", and did not set the
> tranferred actual_length for the URB.
>
> The tranferred actual_length should be set the same way for
> COMP_STOPPED control tranfers as in the generic cases.
>
> generic case if we get an event at:
>
> TRB_SETUP stage:
> length = 0;
>
> TRB_DATA/TRB_NORMAL state:
> length = requested - remaining;
>
> TRB_STATUS stage:
> length = requested
>
> The URB actual_length for control transfers doesn't care about sent
> bytes of the SETUP stage, or remaining bytes of the STATUS stage.
>
> Cc: <stable@xxxxxxxxxxxxxxx>
> Signed-off-by: Mathias Nyman <mathias.nyman@xxxxxxxxxxxxxxx>
> ---
> drivers/usb/host/xhci-ring.c | 21 ++++++---------------
> 1 file changed, 6 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
> index d9936c7..0aca4c9 100644
> --- a/drivers/usb/host/xhci-ring.c
> +++ b/drivers/usb/host/xhci-ring.c
> @@ -1961,6 +1961,7 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td,
> requested = td->urb->transfer_buffer_length;
> remaining = EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
>
> +
> switch (trb_comp_code) {
> case COMP_SUCCESS:
> if (trb_type != TRB_STATUS) {
Why the extra blank line?
thanks,
greg k-h