diff options
| author |   Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-02-11 11:03:30 +0100 |
|---|---|---|
| committer |   Lee Jones <lee.jones@linaro.org> | 2014-03-19 08:58:11 +0000 |
| commit | a7ab1c8b261305af583ce26bb4a14f555fdaa73e (patch) | |
| tree | 70725a3a9bd30a6e307f24696824effdcdda5b8f /drivers/mfd/88pm860x-core.c | |
| parent | mfd: max8925: Fix possible NULL pointer dereference on i2c_new_dummy error (diff) | |
| download | linux-dev-a7ab1c8b261305af583ce26bb4a14f555fdaa73e.tar.xz linux-dev-a7ab1c8b261305af583ce26bb4a14f555fdaa73e.zip | |
mfd: 88pm860x: Fix I2C device resource leak on regmap init fail
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.
Cc: stable@vger.kernel.org
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/88pm860x-core.c')
| -rw-r--r-- | drivers/mfd/88pm860x-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c index c9b1f6422941..2461014a4ad5 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); |