lkml.org 
[lkml]   [2010]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 3/3] mfd: tps6586x - fix tps6586x_add_subdevs error path
    From
    Date
    1. return -ENOMEM if platform_device_alloc() fail.
    2. call platform_device_put() if platform_device_add() fail.

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    drivers/mfd/tps6586x.c | 8 +++++++-
    1 files changed, 7 insertions(+), 1 deletions(-)

    diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
    index 4cde31e..1c91936 100644
    --- a/drivers/mfd/tps6586x.c
    +++ b/drivers/mfd/tps6586x.c
    @@ -273,13 +273,19 @@ static int __devinit tps6586x_add_subdevs(struct tps6586x *tps6586x,
    subdev = &pdata->subdevs[i];

    pdev = platform_device_alloc(subdev->name, subdev->id);
    + if (!pdev) {
    + ret = -ENOMEM;
    + goto failed;
    + }

    pdev->dev.parent = tps6586x->dev;
    pdev->dev.platform_data = subdev->platform_data;

    ret = platform_device_add(pdev);
    - if (ret)
    + if (ret) {
    + platform_device_put(pdev);
    goto failed;
    + }
    }
    return 0;

    --
    1.7.2




    \
     
     \ /
      Last update: 2010-08-24 07:47    [W:0.021 / U:30.808 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site