diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-02-12 11:10:56 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-05-15 09:54:54 +0200 |
| commit | 598c8e6310d0eacc1cb44dd144536981a33bf234 (patch) | |
| tree | 7218f9117ee986aa731dbc72e4bc8d9f815ece1e /drivers/mfd | |
| parent | eda6a2312bdf4d4a7f7f4fbe60641aca1313c5b8 (diff) | |
mfd: 88pm800: Fix I2C device resource leak if probe fails
commit 141050cf3d84fc303df58796d68dc1376b0e8f67 upstream.
During probe the driver allocates two dummy I2C devices for subchips in
function pm800_pages_init(). Additionally this function allocates
regmaps for these subchips. If any of these steps fail then these dummy
I2C devices are not freed and resources leak.
On pm800_pages_init() fail the driver must call pm800_pages_exit() to
unregister dummy I2C devices.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/88pm800.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c index a65447d65605..da1ef3290be5 100644 --- a/drivers/mfd/88pm800.c +++ b/drivers/mfd/88pm800.c @@ -571,7 +571,7 @@ static int pm800_probe(struct i2c_client *client, ret = pm800_pages_init(chip); if (ret) { dev_err(&client->dev, "pm800_pages_init failed!\n"); - goto err_page_init; + goto err_device_init; } ret = device_800_init(chip, pdata); @@ -587,7 +587,6 @@ static int pm800_probe(struct i2c_client *client, err_device_init: pm800_pages_exit(chip); -err_page_init: err_subchip_alloc: pm80x_deinit(); out_init: |