lkml.org 
[lkml]   [2011]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 3/5] driver core/platform_device_add_resources: set resource to NULL if !res
    Date
    This makes the res = NULL case more consistant to the res != NULL case
    as now both overwrite pdev->resource.

    Reviewed-by: Viresh Kumar <viresh.kumar@st.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    ---
    drivers/base/platform.c | 19 +++++++++----------
    1 files changed, 9 insertions(+), 10 deletions(-)

    diff --git a/drivers/base/platform.c b/drivers/base/platform.c
    index 58ad8e8..667f282 100644
    --- a/drivers/base/platform.c
    +++ b/drivers/base/platform.c
    @@ -192,18 +192,17 @@ EXPORT_SYMBOL_GPL(platform_device_alloc);
    int platform_device_add_resources(struct platform_device *pdev,
    const struct resource *res, unsigned int num)
    {
    - struct resource *r;
    + struct resource *r = NULL;

    - if (!res)
    - return 0;
    -
    - r = kmemdup(res, sizeof(struct resource) * num, GFP_KERNEL);
    - if (r) {
    - pdev->resource = r;
    - pdev->num_resources = num;
    - return 0;
    + if (res) {
    + r = kmemdup(res, sizeof(struct resource) * num, GFP_KERNEL);
    + if (!r)
    + return -ENOMEM;
    }
    - return -ENOMEM;
    +
    + pdev->resource = r;
    + pdev->num_resources = num;
    + return 0;
    }
    EXPORT_SYMBOL_GPL(platform_device_add_resources);

    --
    1.7.4.1
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-04-20 09:47    [W:3.690 / U:0.452 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site