diff options
| author |   Laxman Dewangan <ldewangan@nvidia.com> | 2013-09-26 19:03:51 +0530 |
|---|---|---|
| committer |   Lee Jones <lee.jones@linaro.org> | 2013-10-23 16:21:39 +0100 |
| commit | 5e172d751869ca6756a7276168e11d641dc6b58a (patch) | |
| tree | d7a2438b1d237896f533ce02856a4975cf0d3553 /drivers/mfd/palmas.c | |
| parent | mfd: palmas: Reset pm_power_off if it is set for the device (diff) | |
| download | linux-dev-5e172d751869ca6756a7276168e11d641dc6b58a.tar.xz linux-dev-5e172d751869ca6756a7276168e11d641dc6b58a.zip | |
mfd: palmas: Fix resource leak of i2c_dummy devices
Palmas device supports multiple i2c device address and the client
for these addressed are created in the driver as i2c_new_dummy().
The new devices are not getting released in error or removal path and
so it is causing resource leak.
Add the unregister of these newly created dummy devices to avoid resource
leaks.
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/palmas.c')
| -rw-r--r-- | drivers/mfd/palmas.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c index 6aab016f4c37..ae9147873b4a 100644 --- a/drivers/mfd/palmas.c +++ b/drivers/mfd/palmas.c @@ -422,7 +422,7 @@ static int palmas_i2c_probe(struct i2c_client *i2c, dev_err(palmas->dev, "can't attach client %d\n", i); ret = -ENOMEM; - goto err; + goto err_i2c; } palmas->i2c_clients[i]->dev.of_node = of_node_get(node); } @@ -433,7 +433,7 @@ static int palmas_i2c_probe(struct i2c_client *i2c, dev_err(palmas->dev, "Failed to allocate regmap %d, err: %d\n", i, ret); - goto err; + goto err_i2c; } } @@ -452,7 +452,7 @@ static int palmas_i2c_probe(struct i2c_client *i2c, reg); if (ret < 0) { dev_err(palmas->dev, "POLARITY_CTRL updat failed: %d\n", ret); - goto err; + goto err_i2c; } /* Change IRQ into clear on read mode for efficiency */ @@ -466,7 +466,7 @@ static int palmas_i2c_probe(struct i2c_client *i2c, IRQF_ONESHOT | pdata->irq_flags, 0, &palmas_irq_chip, &palmas->irq_data); if (ret < 0) - goto err; + goto err_i2c; no_irq: slave = PALMAS_BASE_TO_SLAVE(PALMAS_PU_PD_OD_BASE); @@ -552,7 +552,6 @@ no_irq: } else if (pdata->pm_off && !pm_power_off) { palmas_dev = palmas; pm_power_off = palmas_power_off; - return ret; } } @@ -560,16 +559,26 @@ no_irq: err_irq: regmap_del_irq_chip(palmas->irq, palmas->irq_data); -err: +err_i2c: + for (i = 1; i < PALMAS_NUM_CLIENTS; i++) { + if (palmas->i2c_clients[i]) + i2c_unregister_device(palmas->i2c_clients[i]); + } return ret; } static int palmas_i2c_remove(struct i2c_client *i2c) { struct palmas *palmas = i2c_get_clientdata(i2c); + int i; regmap_del_irq_chip(palmas->irq, palmas->irq_data); + for (i = 1; i < PALMAS_NUM_CLIENTS; i++) { + if (palmas->i2c_clients[i]) + i2c_unregister_device(palmas->i2c_clients[i]); + } + if (palmas == palmas_dev) { pm_power_off = NULL; palmas_dev = NULL; |