---

yaml --- r: 46615 b: refs/heads/master c: fbfb144 h: refs/heads/master i: 46613: 7ed2f1e 46611: 9856370 46607: 9159830 v: v3
git-mirror · Feb 7, 2007 · 28236af · 28236af
1 parent 63e9353
commit 28236af
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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