X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fbase%2Fplatform.c;h=30480f6f2af2beb9b73d41463f5b8c45ceb4b9ae;hb=a0cf733b333eeeafb7324e2897448006c693c26c;hp=f9c903ba9fcd1259e37120e2db74d55c6acdcbce;hpb=de9e957f12d09793aac7d44ee0f7987dc8019b94;p=powerpc.git

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index f9c903ba9f..30480f6f2a 100644
--- a/drivers/base/platform.c
+++ b/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