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: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Felipe Balbi <balbi@ti.com>

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: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Dan Carpenter · Felipe Balbi
1 parent 0f82768406
Showing 1 changed file with 4 additions and 6 deletions Side-by-side Diff
drivers/usb/gadget/atmel_usba_udc.c
@@ -1772,7 +1772,7 @@
 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 @@
  
 	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 @@
 		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,
...	...	@@ -1772,7 +1772,7 @@
1772	1772	static int atmel_usba_start(struct usb_gadget *gadget,
1773	1773	struct usb_gadget_driver *driver)
1774	1774	{
1775		- int ret = 0;
	1775	+ int ret;
1776	1776	struct usba_udc *udc = container_of(gadget, struct usba_udc, gadget);
1777	1777	unsigned long flags;
1778	1778
1779	1779
...	...	@@ -1784,11 +1784,11 @@
1784	1784
1785	1785	ret = clk_prepare_enable(udc->pclk);
1786	1786	if (ret)
1787		- goto out;
	1787	+ return ret;
1788	1788	ret = clk_prepare_enable(udc->hclk);
1789	1789	if (ret) {
1790	1790	clk_disable_unprepare(udc->pclk);
1791		- goto out;
	1791	+ return ret;
1792	1792	}
1793	1793
1794	1794	DBG(DBG_GADGET, "registered driver `%s'\n", driver->driver.name);
1795	1795
...	...	@@ -1804,11 +1804,9 @@
1804	1804	usba_writel(udc, CTRL, USBA_ENABLE_MASK);
1805	1805	usba_writel(udc, INT_ENB, USBA_END_OF_RESET);
1806	1806	}
1807		-
1808		-out:
1809	1807	spin_unlock_irqrestore(&udc->lock, flags);
1810	1808
1811		- return ret;
	1809	+ return 0;
1812	1810	}
1813	1811
1814	1812	static int atmel_usba_stop(struct usb_gadget *gadget,