From 12b246c24c88e84e666d9b17204bb2a917f80c93 Mon Sep 17 00:00:00 2001
From: Lukasz Majewski <l.majewski@samsung.com>
Date: Fri, 4 May 2012 14:17:16 +0200
Subject: [PATCH] --- yaml --- r: 303832 b: refs/heads/master c:
 1d144c6732f6badd4be7a1383a4ae2adcc3f9386 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/usb/gadget/s3c-hsotg.c | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 1028bfa97dbb..8f02e0f2cbad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04b4a0fce530eab728e27e24b5a8d6192c6f70d9
+refs/heads/master: 1d144c6732f6badd4be7a1383a4ae2adcc3f9386
diff --git a/trunk/drivers/usb/gadget/s3c-hsotg.c b/trunk/drivers/usb/gadget/s3c-hsotg.c
index 1cac0be86f68..5061a2fe9620 100644
--- a/trunk/drivers/usb/gadget/s3c-hsotg.c
+++ b/trunk/drivers/usb/gadget/s3c-hsotg.c
@@ -3558,7 +3558,7 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)
 				 hsotg->supplies);
 	if (ret) {
 		dev_err(dev, "failed to request supplies: %d\n", ret);
-		goto err_supplies;
+		goto err_irq;
 	}
 
 	ret = regulator_bulk_enable(ARRAY_SIZE(hsotg->supplies),
@@ -3637,17 +3637,13 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)
 
 	return 0;
 
- err_ep_mem:
+err_ep_mem:
 	kfree(eps);
-
 err_supplies:
 	s3c_hsotg_phy_disable(hsotg);
-
 	regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
-
-	clk_disable_unprepare(hsotg->clk);
-	clk_put(hsotg->clk);
-
+err_irq:
+	free_irq(hsotg->irq, hsotg);
 err_regs:
 	iounmap(hsotg->regs);
 
@@ -3655,6 +3651,7 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)
 	release_resource(hsotg->regs_res);
 	kfree(hsotg->regs_res);
 err_clk:
+	clk_disable_unprepare(hsotg->clk);
 	clk_put(hsotg->clk);
 err_mem:
 	kfree(hsotg);