Commit 54b7022f authored Aug 12, 2021 by Wesley Cheng Committed by Greg Kroah-Hartman Aug 15, 2021

usb: dwc3: gadget: Clear DEP flags after stop transfers in ep disable



[ Upstream commit 5aef629704ad4d983ecf5c8a25840f16e45b6d59 ]

Ensure that dep->flags are cleared until after stop active transfers
is completed.  Otherwise, the ENDXFER command will not be executed
during ep disable.

Fixes: f09ddcfcb8c5 ("usb: dwc3: gadget: Prevent EP queuing while stopping transfers")
Cc: stable <stable@vger.kernel.org>
Reported-and-tested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Wesley Cheng <wcheng@codeaurora.org>
Link: https://lore.kernel.org/r/1616610664-16495-1-git-send-email-wcheng@codeaurora.org


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent e36245a6

drivers/usb/dwc3/gadget.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -754,10 +754,6 @@ static int __dwc3_gadget_ep_disable(struct dwc3_ep *dep)
		reg &= ~DWC3_DALEPENA_EP(dep->number);
		dwc3_writel(dwc->regs, DWC3_DALEPENA, reg);

		dep->stream_capable = false;
		dep->type = 0;
		dep->flags = 0;

		/* Clear out the ep descriptors for non-ep0 */
		if (dep->number > 1) {
		dep->endpoint.comp_desc = NULL;
		@@ -766,6 +762,10 @@ static int __dwc3_gadget_ep_disable(struct dwc3_ep *dep)

		dwc3_remove_requests(dwc, dep);

		dep->stream_capable = false;
		dep->type = 0;
		dep->flags = 0;

		return 0;
		}