diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-15 10:47:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 22:53:34 +0200 |
| commit | 3e61dfd8509a52d165726831c57b4c8a015d626c (patch) | |
| tree | 28ed342eaf40273024bfdf673247127ea5e96456 | |
| parent | firmware loader: embed device into firmware_priv structure (diff) | |
| download | linux-3e61dfd8509a52d165726831c57b4c8a015d626c.tar.xz linux-3e61dfd8509a52d165726831c57b4c8a015d626c.zip | |
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>
| -rw-r--r-- | drivers/base/platform.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 4d99c8bdfedc..26eb69d88eb6 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); |