]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
usb: gadget: double unlocks on error in atmel_usba_start()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 21 Aug 2013 08:42:24 +0000 (11:42 +0300)
committerFelipe Balbi <balbi@ti.com>
Tue, 27 Aug 2013 20:05:35 +0000 (15:05 -0500)
The "goto out" statements were wrong.  We aren't holding any locks at
that point so we should return directly.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/gadget/atmel_usba_udc.c

index 40d23384b716866b6b0b30923a1ffc3515ecc244..2cb52e0438df1b349a1feca20749e3290739a94a 100644 (file)
@@ -1772,7 +1772,7 @@ out:
 static int atmel_usba_start(struct usb_gadget *gadget,
                struct usb_gadget_driver *driver)
 {
-       int ret = 0;
+       int ret;
        struct usba_udc *udc = container_of(gadget, struct usba_udc, gadget);
        unsigned long flags;
 
@@ -1784,11 +1784,11 @@ static int atmel_usba_start(struct usb_gadget *gadget,
 
        ret = clk_prepare_enable(udc->pclk);
        if (ret)
-               goto out;
+               return ret;
        ret = clk_prepare_enable(udc->hclk);
        if (ret) {
                clk_disable_unprepare(udc->pclk);
-               goto out;
+               return ret;
        }
 
        DBG(DBG_GADGET, "registered driver `%s'\n", driver->driver.name);
@@ -1804,11 +1804,9 @@ static int atmel_usba_start(struct usb_gadget *gadget,
                usba_writel(udc, CTRL, USBA_ENABLE_MASK);
                usba_writel(udc, INT_ENB, USBA_END_OF_RESET);
        }
-
-out:
        spin_unlock_irqrestore(&udc->lock, flags);
 
-       return ret;
+       return 0;
 }
 
 static int atmel_usba_stop(struct usb_gadget *gadget,