diff --git a/[refs] b/[refs]
index ce24b7345c01..e7e04528d331 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8a4bd3456b988fc73b2c291b9e01b434c8fa940
+refs/heads/master: 3e61dfd8509a52d165726831c57b4c8a015d626c
diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c
index 4d99c8bdfedc..26eb69d88eb6 100644
--- a/trunk/drivers/base/platform.c
+++ b/trunk/drivers/base/platform.c
@@ -191,13 +191,13 @@ int platform_device_add_resources(struct platform_device *pdev,
 {
 	struct resource *r;
 
-	r = kmalloc(sizeof(struct resource) * num, GFP_KERNEL);
+	r = kmemdup(res, sizeof(struct resource) * num, GFP_KERNEL);
 	if (r) {
-		memcpy(r, res, sizeof(struct resource) * num);
 		pdev->resource = r;
 		pdev->num_resources = num;
+		return 0;
 	}
-	return r ? 0 : -ENOMEM;
+	return -ENOMEM;
 }
 EXPORT_SYMBOL_GPL(platform_device_add_resources);