]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
usb: dwc3: remove WARN_ON from dwc_stop_active_transfer
authorPratyush Anand <pratyush.anand@st.com>
Fri, 22 Jun 2012 20:53:08 +0000 (02:23 +0530)
committerFelipe Balbi <balbi@ti.com>
Mon, 25 Jun 2012 10:59:26 +0000 (13:59 +0300)
Now we are sure that, if res_trans_idx is zero, then endpoint has been
stopped. So it's safe to just return if endpoint is already stopped. No
need to generate warning anymore.

While doing so, it's better to return when res_trans_idx is zero and
decrease one level of indentation.

Signed-off-by: Pratyush Anand <pratyush.anand@st.com>
[ balbi@ti.com: slightly changed commit log ]

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

index f6fb42da2e6494d8bcc8bfe62c1bce25f82cced9..9ac4835d7b6bd776cc9531b72f1888564efcca5c 100644 (file)
@@ -1870,16 +1870,16 @@ static void dwc3_stop_active_transfer(struct dwc3 *dwc, u32 epnum)
 
        dep = dwc->eps[epnum];
 
-       WARN_ON(!dep->res_trans_idx);
-       if (dep->res_trans_idx) {
-               cmd = DWC3_DEPCMD_ENDTRANSFER;
-               cmd |= DWC3_DEPCMD_HIPRI_FORCERM | DWC3_DEPCMD_CMDIOC;
-               cmd |= DWC3_DEPCMD_PARAM(dep->res_trans_idx);
-               memset(&params, 0, sizeof(params));
-               ret = dwc3_send_gadget_ep_cmd(dwc, dep->number, cmd, &params);
-               WARN_ON_ONCE(ret);
-               dep->res_trans_idx = 0;
-       }
+       if (!dep->res_trans_idx)
+               return;
+
+       cmd = DWC3_DEPCMD_ENDTRANSFER;
+       cmd |= DWC3_DEPCMD_HIPRI_FORCERM | DWC3_DEPCMD_CMDIOC;
+       cmd |= DWC3_DEPCMD_PARAM(dep->res_trans_idx);
+       memset(&params, 0, sizeof(params));
+       ret = dwc3_send_gadget_ep_cmd(dwc, dep->number, cmd, &params);
+       WARN_ON_ONCE(ret);
+       dep->res_trans_idx = 0;
 }
 
 static void dwc3_stop_active_transfers(struct dwc3 *dwc)