From 28236af61bbaba30376d0f250a63241f7f3e33a3 Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Mon, 27 Nov 2006 10:35:08 +0100
Subject: [PATCH] --- yaml --- r: 46615 b: refs/heads/master c:
 fbfb14455391b89edcf37327526988dea7849532 h: refs/heads/master i:   46613:
 7ed2f1e62945f62e82c27ee5ff0e21560f95702f   46611:
 985637041b33c80438b7522ec3ca63d6ef980374   46607:
 9159830ebf84221d46271f5b1d376937e06985a0 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/base/platform.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 983370dffcec..8fc5ec07142f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb360bbf6352712310a7528137919c626a782744
+refs/heads/master: fbfb14455391b89edcf37327526988dea7849532
diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c
index f9c903ba9fcd..30480f6f2af2 100644
--- a/trunk/drivers/base/platform.c
+++ b/trunk/drivers/base/platform.c
@@ -611,8 +611,15 @@ EXPORT_SYMBOL_GPL(platform_bus_type);
 
 int __init platform_bus_init(void)
 {
-	device_register(&platform_bus);
-	return bus_register(&platform_bus_type);
+	int error;
+
+	error = device_register(&platform_bus);
+	if (error)
+		return error;
+	error =  bus_register(&platform_bus_type);
+	if (error)
+		device_unregister(&platform_bus);
+	return error;
 }
 
 #ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK