usb: dwc3: gadget: clear DWC3_PENDING_REQUEST when request is queued
authorFelipe Balbi <balbi@ti.com>
Tue, 15 Sep 2015 14:49:14 +0000 (09:49 -0500)
committerFelipe Balbi <balbi@ti.com>
Sun, 27 Sep 2015 15:54:31 +0000 (10:54 -0500)
Instead of clearing DWC3_PENDING_REQUEST when
we start transfer, let's do it when the request
is actually queued, that way we know for sure
that we're clearing in the right time.

Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/dwc3/gadget.c

index 2d0dc2d5c3c637a479220eccfd2e7e8f91a16736..13ed16a96e37b7588943955ecf5ce34cfddb6624 100644 (file)
@@ -948,7 +948,6 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param,
                dwc3_trace(trace_dwc3_gadget, "%s: endpoint busy", dep->name);
                return -EBUSY;
        }
-       dep->flags &= ~DWC3_EP_PENDING_REQUEST;
 
        /*
         * If we are getting here after a short-out-packet we don't enqueue any
@@ -1117,6 +1116,10 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
                if (ret && ret != -EBUSY)
                        dev_dbg(dwc->dev, "%s: failed to kick transfers\n",
                                        dep->name);
+
+               if (!ret)
+                       dep->flags &= ~DWC3_EP_PENDING_REQUEST;
+
                return ret;
        }