lkml.org 
[lkml]   [2009]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/20] driver core: platform_device_add_data(): use kmemdup()
    Date
    From: Andrew Morton <akpm@linux-foundation.org>

    Instead of open-coding it.

    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    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 0f7d434..ed156a1 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);

    --
    1.6.4.2


    \
     
     \ /
      Last update: 2009-09-15 21:23    [W:0.050 / U:0.064 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site