lkml.org 
[lkml]   [2012]   [Aug]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/6] mfd: palmas improve the error exit path
    Date
    Improve the error exit path so that we correctly de-allocate resources
    that have been allocated upto the point where error occurs.

    Signed-off-by: Graeme Gregory <gg@slimlogic.co.uk>
    ---
    drivers/mfd/palmas.c | 20 +++++++++++---------
    1 file changed, 11 insertions(+), 9 deletions(-)

    diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
    index c4a69f1..5ffd330 100644
    --- a/drivers/mfd/palmas.c
    +++ b/drivers/mfd/palmas.c
    @@ -377,11 +377,11 @@ static int __devinit palmas_i2c_probe(struct i2c_client *i2c,
    reg = pdata->pad1;
    ret = regmap_write(palmas->regmap[slave], addr, reg);
    if (ret)
    - goto err;
    + goto err_irq;
    } else {
    ret = regmap_read(palmas->regmap[slave], addr, &reg);
    if (ret)
    - goto err;
    + goto err_irq;
    }

    if (!(reg & PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_0))
    @@ -412,11 +412,11 @@ static int __devinit palmas_i2c_probe(struct i2c_client *i2c,
    reg = pdata->pad2;
    ret = regmap_write(palmas->regmap[slave], addr, reg);
    if (ret)
    - goto err;
    + goto err_irq;
    } else {
    ret = regmap_read(palmas->regmap[slave], addr, &reg);
    if (ret)
    - goto err;
    + goto err_irq;
    }

    if (!(reg & PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_4))
    @@ -439,13 +439,13 @@ static int __devinit palmas_i2c_probe(struct i2c_client *i2c,

    ret = regmap_write(palmas->regmap[slave], addr, reg);
    if (ret)
    - goto err;
    + goto err_irq;

    children = kmemdup(palmas_children, sizeof(palmas_children),
    GFP_KERNEL);
    if (!children) {
    ret = -ENOMEM;
    - goto err;
    + goto err_irq;
    }

    children[PALMAS_PMIC_ID].platform_data = pdata->pmic_pdata;
    @@ -457,13 +457,15 @@ static int __devinit palmas_i2c_probe(struct i2c_client *i2c,
    kfree(children);

    if (ret < 0)
    - goto err;
    + goto err_devices;

    return ret;

    -err:
    +err_devices:
    mfd_remove_devices(palmas->dev);
    - kfree(palmas);
    +err_irq:
    + regmap_del_irq_chip(palmas->irq, palmas->irq_data);
    +err:
    return ret;
    }

    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-08-28 14:21    [W:0.024 / U:0.140 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site