driver core fixes: device_register() retval check in platform.c

Check the return value of device_register() in platform_bus_init().

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index f9c903ba9fcd..30480f6f2af2 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