提交 824ead03 编写于 作者: K Krzysztof Kozlowski 提交者: Eduardo Valentin

thermal: exynos: Fix unbalanced regulator disable on probe failure

During probe if the regulator could not be enabled, the error exit path
would still disable it. This could lead to unbalanced counter of
regulator enable/disable.

The patch moves code for getting and enabling the regulator from
exynos_map_dt_data() to probe function because it is really not a part
of getting Device Tree properties.
Acked-by: NLukasz Majewski <l.majewski@samsung.com>
Tested-by: NLukasz Majewski <l.majewski@samsung.com>
Reviewed-by: NAlim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: NKrzysztof Kozlowski <k.kozlowski@samsung.com>
Fixes: 5f09a5cb ("thermal: exynos: Disable the regulator on probe failure")
Cc: <stable@vger.kernel.org>
Signed-off-by: NEduardo Valentin <edubezval@gmail.com>
上级 ce5ee161
...@@ -1168,27 +1168,10 @@ static int exynos_map_dt_data(struct platform_device *pdev) ...@@ -1168,27 +1168,10 @@ static int exynos_map_dt_data(struct platform_device *pdev)
struct exynos_tmu_data *data = platform_get_drvdata(pdev); struct exynos_tmu_data *data = platform_get_drvdata(pdev);
struct exynos_tmu_platform_data *pdata; struct exynos_tmu_platform_data *pdata;
struct resource res; struct resource res;
int ret;
if (!data || !pdev->dev.of_node) if (!data || !pdev->dev.of_node)
return -ENODEV; return -ENODEV;
/*
* Try enabling the regulator if found
* TODO: Add regulator as an SOC feature, so that regulator enable
* is a compulsory call.
*/
data->regulator = devm_regulator_get(&pdev->dev, "vtmu");
if (!IS_ERR(data->regulator)) {
ret = regulator_enable(data->regulator);
if (ret) {
dev_err(&pdev->dev, "failed to enable vtmu\n");
return ret;
}
} else {
dev_info(&pdev->dev, "Regulator node (vtmu) not found\n");
}
data->id = of_alias_get_id(pdev->dev.of_node, "tmuctrl"); data->id = of_alias_get_id(pdev->dev.of_node, "tmuctrl");
if (data->id < 0) if (data->id < 0)
data->id = 0; data->id = 0;
...@@ -1312,6 +1295,23 @@ static int exynos_tmu_probe(struct platform_device *pdev) ...@@ -1312,6 +1295,23 @@ static int exynos_tmu_probe(struct platform_device *pdev)
pr_err("thermal: tz: %p ERROR\n", data->tzd); pr_err("thermal: tz: %p ERROR\n", data->tzd);
return PTR_ERR(data->tzd); return PTR_ERR(data->tzd);
} }
/*
* Try enabling the regulator if found
* TODO: Add regulator as an SOC feature, so that regulator enable
* is a compulsory call.
*/
data->regulator = devm_regulator_get(&pdev->dev, "vtmu");
if (!IS_ERR(data->regulator)) {
ret = regulator_enable(data->regulator);
if (ret) {
dev_err(&pdev->dev, "failed to enable vtmu\n");
return ret;
}
} else {
dev_info(&pdev->dev, "Regulator node (vtmu) not found\n");
}
ret = exynos_map_dt_data(pdev); ret = exynos_map_dt_data(pdev);
if (ret) if (ret)
goto err_sensor; goto err_sensor;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册