UPSTREAM: usb: dwc3: gadget: Add the suspend state checking when stopping gadget

[firefly-linux-kernel-4.4.55.git] / drivers / usb / dwc3 / gadget.c

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 92abd5e382fe1dc63227ba52691dbc7006db3f2c..5f29061faa97a08f31a82e493bd548ff432b3288 100644 (file)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -607,24 +607,14 @@ static void dwc3_stop_active_transfer(struct dwc3 *dwc, u32 epnum, bool force);
 static void dwc3_remove_requests(struct dwc3 *dwc, struct dwc3_ep *dep)
 {
        struct dwc3_request             *req;
-       struct dwc3_trb                 *current_trb;
-       unsigned                        transfer_in_flight;
 
-       if (dep->number > 1)
-               current_trb = &dep->trb_pool[dep->trb_enqueue];
-       else
-               current_trb = &dwc->ep0_trb[dep->trb_enqueue];
-       transfer_in_flight = current_trb->ctrl & DWC3_TRB_CTRL_HWO;
+       dwc3_stop_active_transfer(dwc, dep->number, true);
 
-       if (transfer_in_flight && !list_empty(&dep->started_list)) {
-               dwc3_stop_active_transfer(dwc, dep->number, true);
-
-               /* - giveback all requests to gadget driver */
-               while (!list_empty(&dep->started_list)) {
-                       req = next_request(&dep->started_list);
+       /* - giveback all requests to gadget driver */
+       while (!list_empty(&dep->started_list)) {
+               req = next_request(&dep->started_list);
 
-                       dwc3_gadget_giveback(dep, req, -ESHUTDOWN);
-               }
+               dwc3_gadget_giveback(dep, req, -ESHUTDOWN);
        }
 
        while (!list_empty(&dep->pending_list)) {
@@ -1584,14 +1574,8 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend)
 
        do {
                reg = dwc3_readl(dwc->regs, DWC3_DSTS);
-               if (is_on) {
-                       if (!(reg & DWC3_DSTS_DEVCTRLHLT))
-                               break;
-               } else {
-                       if (reg & DWC3_DSTS_DEVCTRLHLT)
-                               break;
-               }
-       } while (--timeout);
+               reg &= DWC3_DSTS_DEVCTRLHLT;
+       } while (--timeout && !(!is_on ^ !reg));
 
        if (!timeout)
                return -ETIMEDOUT;
@@ -1823,6 +1807,9 @@ err0:
 
 static void __dwc3_gadget_stop(struct dwc3 *dwc)
 {
+       if (pm_runtime_suspended(dwc->dev))
+               return;
+
        dwc3_gadget_disable_irq(dwc);
        __dwc3_gadget_ep_disable(dwc->eps[0]);
        __dwc3_gadget_ep_disable(dwc->eps[1]);