aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-15 10:47:55 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-05 13:53:34 -0700
commit3e61dfd8509a52d165726831c57b4c8a015d626c (patch)
tree28ed342eaf40273024bfdf673247127ea5e96456 /drivers/base
parentf8a4bd3456b988fc73b2c291b9e01b434c8fa940 (diff)
downloadkernel_samsung_smdk4412-3e61dfd8509a52d165726831c57b4c8a015d626c.zip
kernel_samsung_smdk4412-3e61dfd8509a52d165726831c57b4c8a015d626c.tar.gz
kernel_samsung_smdk4412-3e61dfd8509a52d165726831c57b4c8a015d626c.tar.bz2
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>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/platform.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 4d99c8b..26eb69d 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);