1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 9e0e4fc24c46..65cb4c397603 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -220,17 +220,16 @@ EXPORT_SYMBOL_GPL(platform_device_add_resources);
 int platform_device_add_data(struct platform_device *pdev, const void *data,
                              size_t size)
 {
-        void *d;
+        void *d = NULL;
 
-        if (!data)
-                return 0;
-
-        d = kmemdup(data, size, GFP_KERNEL);
-        if (d) {
-                pdev->dev.platform_data = d;
-                return 0;
+        if (data) {
+                d = kmemdup(data, size, GFP_KERNEL);
+                if (!d)
+                        return -ENOMEM;
         }
-        return -ENOMEM;
+
+        pdev->dev.platform_data = d;
+        return 0;
 }
 EXPORT_SYMBOL_GPL(platform_device_add_data);