From be07f81b388b25b5db5d004957c80fb9536b5e94 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 14 Aug 2010 11:06:19 +0200
Subject: [PATCH] --- yaml --- r: 210215 b: refs/heads/master c:
 08a3b3b1c2e622e378d9086aee9e2e42ce37591d h: refs/heads/master i:   210213:
 ebb96f0d59a0f8f5fd92dc9d76621312145b0f16   210211:
 09e8b94a728068c5568752a9ad776cbb96ef343d   210207:
 3a3287fbe9fdafc4c209c9d823bd31bbdca6d556 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/usb/host/ehci-ppc-of.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 03033d884e85..81ef82e6d93d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f1312b260499b34bb92fc9bd8ca1560dda2c4da
+refs/heads/master: 08a3b3b1c2e622e378d9086aee9e2e42ce37591d
diff --git a/trunk/drivers/usb/host/ehci-ppc-of.c b/trunk/drivers/usb/host/ehci-ppc-of.c
index 335ee699fd85..ba52be473027 100644
--- a/trunk/drivers/usb/host/ehci-ppc-of.c
+++ b/trunk/drivers/usb/host/ehci-ppc-of.c
@@ -192,17 +192,19 @@ ehci_hcd_ppc_of_probe(struct platform_device *op, const struct of_device_id *mat
 	}
 
 	rv = usb_add_hcd(hcd, irq, 0);
-	if (rv == 0)
-		return 0;
+	if (rv)
+		goto err_ehci;
+
+	return 0;
 
+err_ehci:
+	if (ehci->has_amcc_usb23)
+		iounmap(ehci->ohci_hcctrl_reg);
 	iounmap(hcd->regs);
 err_ioremap:
 	irq_dispose_mapping(irq);
 err_irq:
 	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-
-	if (ehci->has_amcc_usb23)
-		iounmap(ehci->ohci_hcctrl_reg);
 err_rmr:
 	usb_put_hcd(hcd);