From 8d74729cda57196c2cac92981f23f0cf362bb00a Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 6 Aug 2009 16:00:44 -0700
Subject: [PATCH] --- yaml --- r: 162587 b: refs/heads/master c:
 daa4122673f002911122cac2b996bd36b6c01b32 h: refs/heads/master i:   162585:
 454ebabddecfe27672027c64dc91d56dccbf7263   162583:
 60049bb4192fa980fd12bb646f5dc658e4ae80b7 v: v3

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

diff --git a/[refs] b/[refs]
index 9b94b02496e6..59b5fc7217ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4622709445705c1e423d2addcfd8ccae052fe0ba
+refs/heads/master: daa4122673f002911122cac2b996bd36b6c01b32
diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c
index 0f7d434ce983..ed156a13aa40 100644
--- a/trunk/drivers/base/platform.c
+++ b/trunk/drivers/base/platform.c
@@ -10,6 +10,7 @@
  * information.
  */
 
+#include <linux/string.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -213,14 +214,13 @@ 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 = kmemdup(data, size, GFP_KERNEL);
 
-	d = kmalloc(size, GFP_KERNEL);
 	if (d) {
-		memcpy(d, data, size);
 		pdev->dev.platform_data = d;
+		return 0;
 	}
-	return d ? 0 : -ENOMEM;
+	return -ENOMEM;
 }
 EXPORT_SYMBOL_GPL(platform_device_add_data);