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

Commit 0d4976ec authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

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: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d3a43e66

drivers/usb/host/xhci-ring.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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",

		xhci_warn(xhci, "WARN Set TR deq ptr command for freed stream ID %u\n",

				stream_id);

				stream_id);

		/* XXX: Harmless??? */

		/* XXX: Harmless??? */

		dev->eps[ep_index].ep_state &= ~SET_DEQ_PENDING;

		goto cleanup;

		return;

	}

	}





	ep_ctx = xhci_get_ep_ctx(xhci, dev->out_ctx, ep_index);

	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].ep_state &= ~SET_DEQ_PENDING;

	dev->eps[ep_index].queued_deq_seg = NULL;

	dev->eps[ep_index].queued_deq_seg = NULL;

	dev->eps[ep_index].queued_deq_ptr = NULL;

	dev->eps[ep_index].queued_deq_ptr = NULL;