From 74d75d4e56855168f561c4dc543052bf36f56e59 Mon Sep 17 00:00:00 2001
From: Todd Poynor <toddpoynor@google.com>
Date: Thu, 26 May 2011 12:25:53 -0700
Subject: [PATCH] --- yaml --- r: 253152 b: refs/heads/master c:
 03b562d7859c6d7c640f071b422d521146471d6d h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/mach-omap2/omap_phy_internal.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3e86cf0448e7..333310034d08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21a42c92750446008dc0847a78aba5459e3b6b5a
+refs/heads/master: 03b562d7859c6d7c640f071b422d521146471d6d
diff --git a/trunk/arch/arm/mach-omap2/omap_phy_internal.c b/trunk/arch/arm/mach-omap2/omap_phy_internal.c
index f47813edd951..58775e3c8476 100644
--- a/trunk/arch/arm/mach-omap2/omap_phy_internal.c
+++ b/trunk/arch/arm/mach-omap2/omap_phy_internal.c
@@ -56,8 +56,10 @@ int omap4430_phy_init(struct device *dev)
 	/* Power down the phy */
 	__raw_writel(PHY_PD, ctrl_base + CONTROL_DEV_CONF);
 
-	if (!dev)
+	if (!dev) {
+		iounmap(ctrl_base);
 		return 0;
+	}
 
 	phyclk = clk_get(dev, "ocp2scp_usb_phy_ick");
 	if (IS_ERR(phyclk)) {