Browse Source

mfd: 88pm800: Fix I2C device resource leak if probe fails

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.

Cc: stable@vger.kernel.org
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Krzysztof Kozlowski 11 years ago
parent
commit
141050cf3d
1 changed files with 1 additions and 2 deletions
  1. 1 2
      drivers/mfd/88pm800.c

+ 1 - 2
drivers/mfd/88pm800.c

@@ -571,7 +571,7 @@ static int pm800_probe(struct i2c_client *client,
 	ret = pm800_pages_init(chip);
 	ret = pm800_pages_init(chip);
 	if (ret) {
 	if (ret) {
 		dev_err(&client->dev, "pm800_pages_init failed!\n");
 		dev_err(&client->dev, "pm800_pages_init failed!\n");
-		goto err_page_init;
+		goto err_device_init;
 	}
 	}
 
 
 	ret = device_800_init(chip, pdata);
 	ret = device_800_init(chip, pdata);
@@ -587,7 +587,6 @@ static int pm800_probe(struct i2c_client *client,
 
 
 err_device_init:
 err_device_init:
 	pm800_pages_exit(chip);
 	pm800_pages_exit(chip);
-err_page_init:
 err_subchip_alloc:
 err_subchip_alloc:
 	pm80x_deinit();
 	pm80x_deinit();
 out_init:
 out_init: