diff options
| author | Felipe Balbi <balbi@ti.com> | 2012-05-31 09:29:49 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-06-03 22:08:27 +0200 |
| commit | ef21ede65ee3e0dfd8f2cb37de8892816e2f1257 (patch) | |
| tree | eb66039a091b94d660b088fe73813e413f6accfa /drivers/usb/dwc3/ep0.c | |
| parent | usb: dwc3: gadget: move AcceptU1Ena and AcceptU2Ena to Reset IRQ (diff) | |
| download | linux-ef21ede65ee3e0dfd8f2cb37de8892816e2f1257.tar.xz linux-ef21ede65ee3e0dfd8f2cb37de8892816e2f1257.zip | |
usb: dwc3: ep0: simplify error handling on dwc3_ep0_inspect_setup
There's no need for returning early. Instead,
we can call dwc3_ep0_stall_and_restart()
conditionally.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/dwc3/ep0.c')
| -rw-r--r-- | drivers/usb/dwc3/ep0.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index e31bcd65e7ec..83fcf392dda7 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -641,11 +641,11 @@ static void dwc3_ep0_inspect_setup(struct dwc3 *dwc, const struct dwc3_event_depevt *event) { struct usb_ctrlrequest *ctrl = dwc->ctrl_req; - int ret; + int ret = -EINVAL; u32 len; if (!dwc->gadget_driver) - goto err; + goto out; len = le16_to_cpu(ctrl->wLength); if (!len) { @@ -666,11 +666,9 @@ static void dwc3_ep0_inspect_setup(struct dwc3 *dwc, if (ret == USB_GADGET_DELAYED_STATUS) dwc->delayed_status = true; - if (ret >= 0) - return; - -err: - dwc3_ep0_stall_and_restart(dwc); +out: + if (ret < 0) + dwc3_ep0_stall_and_restart(dwc); } static void dwc3_ep0_complete_data(struct dwc3 *dwc, |