@@ -988,7 +988,6 @@ static int xhci_handle_halted_endpoint(struct xhci_hcd *xhci,
/* add td to cancelled list and let reset ep handler take care of it */
if (reset_type == EP_HARD_RESET) {
- ep->ep_state |= EP_HARD_CLEAR_TOGGLE;
if (td && list_empty(&td->cancelled_td_list)) {
list_add_tail(&td->cancelled_td_list, &ep->cancelled_td_list);
td->cancel_status = TD_HALTED;
@@ -1006,6 +1005,8 @@ static int xhci_handle_halted_endpoint(struct xhci_hcd *xhci,
return err;
ep->ep_state |= EP_HALTED;
+ if (reset_type == EP_HARD_RESET)
+ ep->ep_state |= EP_HARD_CLEAR_TOGGLE;
xhci_ring_cmd_db(xhci);
The flag tells xhci_endpoint_reset() that toggle/sequence state is being cleared or has been cleared by Reset Endpoint. This only works if we actually queue the Reset Endpoint command. Impact should be minimal, because the endpoint can't start running with wrong toggle state if it's still halted, and class driver is unlikely to usb_clear_halt() if the halted TD isn't given back (it should normally unlink all URBs first before calling that). But it looks wrong and could cause problems if the code changes. Signed-off-by: Michal Pecio <michal.pecio@gmail.com> --- drivers/usb/host/xhci-ring.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)