From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Date: Tue, 18 Mar 2014 12:57:50 +0000 (+0100)
Subject: mfd: sec-core: Fix I2C dummy device resource leak on probe failure
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8c66eeced1989c98104783832ab445305fa8c7a3;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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>
---

diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index e9bf73ba6e69..91405e94cfee 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;
 }