From 283ad3d2e8469f5b6e8ca71744f1ae8ab69099e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 15 Jun 2010 10:47:55 +0200 Subject: [PATCH] --- yaml --- r: 205521 b: refs/heads/master c: 3e61dfd8509a52d165726831c57b4c8a015d626c h: refs/heads/master i: 205519: 7e01b9f533bbf7a3a8cce264661d041a0333ff0c v: v3 --- [refs] | 2 +- trunk/drivers/base/platform.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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);