| Message ID | 20200821070652.27782-1-dinghui@sangfor.com.cn |
|---|---|
| State | New |
| Headers | show |
| Series | xhci: Always restore EP_SOFT_CLEAR_TOGGLE even if ep reset failed | expand |
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 3c41b14ecce7..e9884ae9c77d 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -3236,10 +3236,11 @@ static void xhci_endpoint_reset(struct usb_hcd *hcd, wait_for_completion(cfg_cmd->completion); - ep->ep_state &= ~EP_SOFT_CLEAR_TOGGLE; xhci_free_command(xhci, cfg_cmd); cleanup: xhci_free_command(xhci, stop_cmd); + if (ep->ep_state & EP_SOFT_CLEAR_TOGGLE) + ep->ep_state &= ~EP_SOFT_CLEAR_TOGGLE; } static int xhci_check_streams_endpoint(struct xhci_hcd *xhci,
Some devices driver call libusb_clear_halt when target ep queue is not empty. (eg. spice client connected to qemu for usb redir) Before commit f5249461b504 ("xhci: Clear the host side toggle manually when endpoint is soft reset"), that works well. But now, we got the error log: EP not empty, refuse reset xhch_endpoint_reset failed and left ep_state's EP_SOFT_CLEAR_TOGGLE bit is still on So all the subsequent urb sumbit to the ep will fail with the warn log: Can't enqueue URB while manually clearing toggle We need restore ep_state EP_SOFT_CLEAR_TOGGLE bit after xhci_endpoint_reset, even if it is failed. Signed-off-by: Ding Hui <dinghui@sangfor.com.cn> --- drivers/usb/host/xhci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)