diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-15 08:45:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-15 08:45:20 +0100 |
| commit | aa403f257e992eac33cd9afd1d87ce9299f6db7a (patch) | |
| tree | 58d78528f35661b96ccfe8979c97044dca75855c /drivers/usb/host/xhci-ring.c | |
| parent | usb: typec: tipd: Separate file for tracepoint creation (diff) | |
| parent | Linux 5.12-rc3 (diff) | |
| download | wireguard-linux-aa403f257e992eac33cd9afd1d87ce9299f6db7a.tar.xz wireguard-linux-aa403f257e992eac33cd9afd1d87ce9299f6db7a.zip | |
Merge 5.12-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/xhci-ring.c')
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index c8a880111435..65dba0fba605 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -2483,7 +2483,8 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_td *td, remaining = 0; break; case COMP_USB_TRANSACTION_ERROR: - if ((ep_ring->err_count++ > MAX_SOFT_RETRY) || + if (xhci->quirks & XHCI_NO_SOFT_RETRY || + (ep_ring->err_count++ > MAX_SOFT_RETRY) || le32_to_cpu(slot_ctx->tt_info) & TT_SLOT) break; |