Commit 2ab73952 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Luis Henriques

thermal: exynos: Disable the regulator on probe failure

commit 5f09a5cb upstream.

During probe the regulator (if present) was enabled but not disabled in
case of failure. So an unsuccessful probe lead to enabling the
regulator which was actually not needed because the device was not
enabled.

Additionally each deferred probe lead to increase of regulator enable
count so it would not be effectively disabled during removal of the
device.

Test HW: Exynos4412 - Trats2 board
Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Fixes: 498d22f6 ("thermal: exynos: Support for TMU regulator defined at device tree")
Reviewed-by: default avatarJavier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: default avatarLukasz Majewski <l.majewski@samsung.com>
Tested-by: default avatarLukasz Majewski <l.majewski@samsung.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 83365516
...@@ -752,6 +752,8 @@ static int exynos_tmu_probe(struct platform_device *pdev) ...@@ -752,6 +752,8 @@ static int exynos_tmu_probe(struct platform_device *pdev)
err_clk_sec: err_clk_sec:
if (!IS_ERR(data->clk_sec)) if (!IS_ERR(data->clk_sec))
clk_unprepare(data->clk_sec); clk_unprepare(data->clk_sec);
if (!IS_ERR_OR_NULL(data->regulator))
regulator_disable(data->regulator);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment