diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-03-18 13:57:50 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-03-19 09:00:08 +0000 |
| commit | 8c66eeced1989c98104783832ab445305fa8c7a3 (patch) | |
| tree | 04d24dd2e725a75bf5e234369b5f3846b0f10541 /drivers/mfd/sec-core.c | |
| parent | 53c31b3437a6400c6ffc2c9315680217ad84cb6d (diff) | |
| download | linux-0-day-8c66eeced1989c98104783832ab445305fa8c7a3.tar.gz linux-0-day-8c66eeced1989c98104783832ab445305fa8c7a3.tar.xz | |
mfd: sec-core: Fix I2C dummy device resource leak on probe failure
Dummy I2C device allocated in sec_pmic_probe() leaked if
devm_regmap_init_i2c() failed. Unregister it before returning from
probe.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/sec-core.c')
| -rw-r--r-- | drivers/mfd/sec-core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c index e9bf73ba6e69e..91405e94cfee2 100644 --- a/drivers/mfd/sec-core.c +++ b/drivers/mfd/sec-core.c @@ -347,7 +347,7 @@ static int sec_pmic_probe(struct i2c_client *i2c, ret = PTR_ERR(sec_pmic->regmap_rtc); dev_err(&i2c->dev, "Failed to allocate RTC register map: %d\n", ret); - return ret; + goto err_regmap_rtc; } if (pdata && pdata->cfg_pmic_irq) @@ -388,14 +388,15 @@ static int sec_pmic_probe(struct i2c_client *i2c, } if (ret) - goto err; + goto err_mfd; device_init_wakeup(sec_pmic->dev, sec_pmic->wakeup); return ret; -err: +err_mfd: sec_irq_exit(sec_pmic); +err_regmap_rtc: i2c_unregister_device(sec_pmic->rtc); return ret; } |