summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-11-18 12:40:39 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-12-22 18:42:52 +0900
commitd6435102d4ca3b5655c0105abe924abec17ffeb8 (patch)
tree4d94c37b7b57c47e891e1a2c0e19347b3a49aafd
parente7c98dc76d5823444059205e0c7aca49743679f3 (diff)
downloadblackbird-op-linux-d6435102d4ca3b5655c0105abe924abec17ffeb8.tar.gz
blackbird-op-linux-d6435102d4ca3b5655c0105abe924abec17ffeb8.zip
usb: Fix up sh_mobile usbf clock framework warnings.
drivers/usb/gadget/m66592-udc.c: In function 'm66592_probe': drivers/usb/gadget/m66592-udc.c:1672: warning: label 'clean_up2' defined but not used drivers/usb/host/r8a66597-hcd.c: In function 'r8a66597_probe': drivers/usb/host/r8a66597-hcd.c:2401: warning: label 'clean_up2' defined but not used Added by commit 985fc7c81c7852f2e104c71cbe913ace683c9e6a ("sh: sh_mobile usbf clock framework support"). Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/usb/gadget/m66592-udc.c2
-rw-r--r--drivers/usb/host/r8a66597-hcd.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c
index 201c67b625cc..3a8879ec2061 100644
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
@@ -1668,8 +1668,8 @@ clean_up3:
#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/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index d99b9c7098b5..c21f14e0666a 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/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:
OpenPOWER on IntegriCloud