]> git.karo-electronics.de Git - linux-beck.git/commitdiff
usb: dwc3: ep0: simplify error handling on dwc3_ep0_inspect_setup
authorFelipe Balbi <balbi@ti.com>
Thu, 31 May 2012 07:29:49 +0000 (10:29 +0300)
committerFelipe Balbi <balbi@ti.com>
Sun, 3 Jun 2012 20:08:27 +0000 (23:08 +0300)
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>
drivers/usb/dwc3/ep0.c

index e31bcd65e7ecbb66b188c73b0437fc09df5047e4..83fcf392dda7956ca2dc76e73bdf98e0be1e01f8 100644 (file)
@@ -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,