From 8b94eda93401471792ca0df9bdb3f3ea5a3d0c5f Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sun, 29 Aug 2010 21:47:18 +0200
Subject: [PATCH] --- yaml --- r: 210295 b: refs/heads/master c:
 fa9fc821f8892590211a9aa9e855eb83152b9870 h: refs/heads/master i:   210293:
 99ee3379f044a76a6cd22f375819bb4a455ba345   210291:
 db77ecfa91b144acb5e03ec8c566cfa9ab38b1c9   210287:
 ea62be3f57069b4209722f0c95f5af54ff72cd4d v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/powerpc/platforms/83xx/mpc837x_mds.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 71f70ba85177..d2d1b7e6f6c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff33f1821259d00d3fd85d86f59783e2ca3c9ee1
+refs/heads/master: fa9fc821f8892590211a9aa9e855eb83152b9870
diff --git a/trunk/arch/powerpc/platforms/83xx/mpc837x_mds.c b/trunk/arch/powerpc/platforms/83xx/mpc837x_mds.c
index f9751c8905be..83068322abd1 100644
--- a/trunk/arch/powerpc/platforms/83xx/mpc837x_mds.c
+++ b/trunk/arch/powerpc/platforms/83xx/mpc837x_mds.c
@@ -48,8 +48,10 @@ static int mpc837xmds_usb_cfg(void)
 		return -1;
 
 	np = of_find_node_by_name(NULL, "usb");
-	if (!np)
-		return -ENODEV;
+	if (!np) {
+		ret = -ENODEV;
+		goto out;
+	}
 	phy_type = of_get_property(np, "phy_type", NULL);
 	if (phy_type && !strcmp(phy_type, "ulpi")) {
 		clrbits8(bcsr_regs + 12, BCSR12_USB_SER_PIN);
@@ -65,8 +67,9 @@ static int mpc837xmds_usb_cfg(void)
 	}
 
 	of_node_put(np);
+out:
 	iounmap(bcsr_regs);
-	return 0;
+	return ret;
 }
 
 /* ************************************************************************