diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2009-08-06 16:00:44 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 09:50:48 -0700 |
| commit | daa4122673f002911122cac2b996bd36b6c01b32 (patch) | |
| tree | cd99fcfdedcaf94efc60585968c60ed417f1430c | |
| parent | 4622709445705c1e423d2addcfd8ccae052fe0ba (diff) | |
driver core: platform_device_add_data(): use kmemdup()
Instead of open-coding it.
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/base/platform.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 0f7d434ce98..ed156a13aa4 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -10,6 +10,7 @@ * information. */ +#include <linux/string.h> #include <linux/platform_device.h> #include <linux/module.h> #include <linux/init.h> @@ -213,14 +214,13 @@ EXPORT_SYMBOL_GPL(platform_device_add_resources); int platform_device_add_data(struct platform_device *pdev, const void *data, size_t size) { - void *d; + void *d = kmemdup(data, size, GFP_KERNEL); - d = kmalloc(size, GFP_KERNEL); if (d) { - memcpy(d, data, size); pdev->dev.platform_data = d; + return 0; } - return d ? 0 : -ENOMEM; + return -ENOMEM; } EXPORT_SYMBOL_GPL(platform_device_add_data); |