提交 ffb62a14 编写于 作者: D Dan Carpenter 提交者: Felipe Balbi

usb: gadget: double unlocks on error in atmel_usba_start()

The "goto out" statements were wrong.  We aren't holding any locks at
that point so we should return directly.
Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: NFelipe Balbi <balbi@ti.com>
上级 0f827684
......@@ -1772,7 +1772,7 @@ static irqreturn_t usba_vbus_irq(int irq, void *devid)
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,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册