lkml.org 
[lkml]   [2014]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 072/151] mfd: 88pm860x: Fix I2C device resource leak on regmap init fail
    Date
    3.13.11.1 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Krzysztof Kozlowski <k.kozlowski@samsung.com>

    commit a7ab1c8b261305af583ce26bb4a14f555fdaa73e upstream.

    During probe the driver allocates dummy I2C device for companion chip
    and then allocates a regmap for it. If regmap_init_i2c() fails then the
    I2C driver (allocated with i2c_new_dummy()) is not freed and this
    resource leaks.

    Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/mfd/88pm860x-core.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
    index c9b1f64..2461014 100644
    --- a/drivers/mfd/88pm860x-core.c
    +++ b/drivers/mfd/88pm860x-core.c
    @@ -1185,6 +1185,7 @@ static int pm860x_probe(struct i2c_client *client,
    ret = PTR_ERR(chip->regmap_companion);
    dev_err(&chip->companion->dev,
    "Failed to allocate register map: %d\n", ret);
    + i2c_unregister_device(chip->companion);
    return ret;
    }
    i2c_set_clientdata(chip->companion, chip);
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-05-02 20:01    [W:4.049 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site