aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2014-02-11 05:03:30 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-06 10:55:28 -0400
commitfe293a297e92c2979ac678b62aedfd78482e2144 (patch)
tree2ccbd9896803a986f9f2e018274542535b748598
parentda0bc89767da7817dc6df9cfa10321b40ffdf210 (diff)
mfd: 88pm860x: Fix I2C device resource leak on regmap init fail
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/mfd/88pm860x-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index c270d0b268ad..30cf7eef2a8f 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -1190,6 +1190,7 @@ static int pm860x_probe(struct i2c_client *client,
1190 ret = PTR_ERR(chip->regmap_companion); 1190 ret = PTR_ERR(chip->regmap_companion);
1191 dev_err(&chip->companion->dev, 1191 dev_err(&chip->companion->dev,
1192 "Failed to allocate register map: %d\n", ret); 1192 "Failed to allocate register map: %d\n", ret);
1193 i2c_unregister_device(chip->companion);
1193 return ret; 1194 return ret;
1194 } 1195 }
1195 i2c_set_clientdata(chip->companion, chip); 1196 i2c_set_clientdata(chip->companion, chip);