From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Tue, 15 Jun 2010 08:47:55 +0000 (+0200)
Subject: Driver core: use kmemdup in platform_device_add_resources
X-Git-Tag: v2.6.36-rc1~521^2~19
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3e61dfd8509a52d165726831c57b4c8a015d626c;p=~emulex%2Finfiniband.git

Driver core: use kmemdup in platform_device_add_resources

This makes platform_device_add_resources look like
platform_device_add_data.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 4d99c8bdfed..26eb69d88eb 100644
--- a/drivers/base/platform.c
+++ b/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);