From 4684d5d01087ecdf21576ee33a797c8f32bc108d Mon Sep 17 00:00:00 2001 From: Pratyush Anand Date: Sat, 23 Jun 2012 02:23:08 +0530 Subject: [PATCH] --- yaml --- r: 316959 b: refs/heads/master c: 3daf74d78dfcd552445c35f1b82a271ca305ceb9 h: refs/heads/master i: 316957: 84fab1b1fb99e72320a92e65fc66a7aaeaa84d2a 316955: 705d387822b2a332e38ad183c88f2873f6e3d39a 316951: 6c2e932856abf640305465c1007ca254aa7c4291 316943: e01b63a8c28da3a1fcd0ab780153c83342ac5d24 316927: a11a0a8db6921df230f8fdc29b2e9a52c070d289 v: v3 --- [refs] | 2 +- trunk/drivers/usb/dwc3/gadget.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index a7fb5adf74f3..14f10896b7a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58a0f23fddd0a71d8fa22e6ef7627298a8ed29a6 +refs/heads/master: 3daf74d78dfcd552445c35f1b82a271ca305ceb9 diff --git a/trunk/drivers/usb/dwc3/gadget.c b/trunk/drivers/usb/dwc3/gadget.c index f6fb42da2e64..9ac4835d7b6b 100644 --- a/trunk/drivers/usb/dwc3/gadget.c +++ b/trunk/drivers/usb/dwc3/gadget.c @@ -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(¶ms, 0, sizeof(params)); - ret = dwc3_send_gadget_ep_cmd(dwc, dep->number, cmd, ¶ms); - 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(¶ms, 0, sizeof(params)); + ret = dwc3_send_gadget_ep_cmd(dwc, dep->number, cmd, ¶ms); + WARN_ON_ONCE(ret); + dep->res_trans_idx = 0; } static void dwc3_stop_active_transfers(struct dwc3 *dwc)