From 94800b12da10f5560827af34a000a88528aa8d79 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 18 Nov 2008 12:40:39 +0900
Subject: [PATCH] --- yaml --- r: 120055 b: refs/heads/master c:
 d6435102d4ca3b5655c0105abe924abec17ffeb8 h: refs/heads/master i:   120053:
 7da551e3aac3bc80f85f9519ee9280ea7326c861   120051:
 af44e2fe21c0d78af845e0ab1d0fce096abb2207   120047:
 029bcbc42f5705bab49e8f334d62073d6cb5d479 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/usb/gadget/m66592-udc.c | 2 +-
 trunk/drivers/usb/host/r8a66597-hcd.c | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ee452dc91da2..fdcb60a1985e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7c98dc76d5823444059205e0c7aca49743679f3
+refs/heads/master: d6435102d4ca3b5655c0105abe924abec17ffeb8
diff --git a/trunk/drivers/usb/gadget/m66592-udc.c b/trunk/drivers/usb/gadget/m66592-udc.c
index 201c67b625cc..3a8879ec2061 100644
--- a/trunk/drivers/usb/gadget/m66592-udc.c
+++ b/trunk/drivers/usb/gadget/m66592-udc.c
@@ -1668,8 +1668,8 @@ static int __init m66592_probe(struct platform_device *pdev)
 #if defined(CONFIG_SUPERH_BUILT_IN_M66592) && defined(CONFIG_HAVE_CLK)
 	clk_disable(m66592->clk);
 	clk_put(m66592->clk);
-#endif
 clean_up2:
+#endif
 	free_irq(irq, m66592);
 clean_up:
 	if (m66592) {
diff --git a/trunk/drivers/usb/host/r8a66597-hcd.c b/trunk/drivers/usb/host/r8a66597-hcd.c
index d99b9c7098b5..c21f14e0666a 100644
--- a/trunk/drivers/usb/host/r8a66597-hcd.c
+++ b/trunk/drivers/usb/host/r8a66597-hcd.c
@@ -2396,9 +2396,8 @@ static int __init r8a66597_probe(struct platform_device *pdev)
 clean_up3:
 #if defined(CONFIG_SUPERH_ON_CHIP_R8A66597) && defined(CONFIG_HAVE_CLK)
 	clk_put(r8a66597->clk);
-#endif
-
 clean_up2:
+#endif
 	usb_put_hcd(hcd);
 
 clean_up: