From: Hans de Goede Date: Wed, 20 Aug 2014 13:41:55 +0000 (+0300) Subject: xhci: Always ring the doorbell for active eps when a Set TR deq ptr cmd completes X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0d4976ec8ec17f331a094e3d6dd3917f4c8dd1ce;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git xhci: Always ring the doorbell for active eps when a Set TR deq ptr cmd completes Even if the stream for which the command was intended has been freed in the mean time. This ensures that things start rolling again after an unlink / halt. Signed-off-by: Hans de Goede Acked-by: Mathias Nyman Signed-off-by: Mathias Nyman Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 074eac69a609..2853b2fb57e2 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -965,8 +965,7 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, xhci_warn(xhci, "WARN Set TR deq ptr command for freed stream ID %u\n", stream_id); /* XXX: Harmless??? */ - dev->eps[ep_index].ep_state &= ~SET_DEQ_PENDING; - return; + goto cleanup; } ep_ctx = xhci_get_ep_ctx(xhci, dev->out_ctx, ep_index); @@ -1031,6 +1030,7 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, } } +cleanup: dev->eps[ep_index].ep_state &= ~SET_DEQ_PENDING; dev->eps[ep_index].queued_deq_seg = NULL; dev->eps[ep_index].queued_deq_ptr = NULL;