thermal: exynos: Disable the regulator on probe failure

commit 5f09a5c 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: Krzysztof Kozlowski <[email protected]> Fixes: 498d22f ("thermal: exynos: Support for TMU regulator defined at device tree") Reviewed-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Lukasz Majewski <[email protected]> Tested-by: Lukasz Majewski <[email protected]> Signed-off-by: Eduardo Valentin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
davet321 · Aug 17, 2015 · 00d707a · 00d707a
1 parent 1770acb
commit 00d707a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
@@ -1209,6 +1209,8 @@ static int exynos_tmu_probe(struct platform_device *pdev)
 	if (!IS_ERR(data->clk_sec))
 		clk_unprepare(data->clk_sec);
 err_sensor:
+	if (!IS_ERR_OR_NULL(data->regulator))
+		regulator_disable(data->regulator);
 	thermal_zone_of_sensor_unregister(&pdev->dev, data->tzd);
 
 	return ret;