Skip to contentSkip to conversation

patch "thermal: exynos: Fix unbalanced regulator disable on probe failure" added to thermal-soc tree

PATCH Eduardo Valentin 1 participant 1 message Nov 5, 2015

Subsystems (4)
Stable branch Arm Samsung Exynos Thermal Samsung thermal driver
lore
Share & tools
lore

Eduardo Valentin

author
#0 lore raw

This is a simple automated notification to let you know that I've just added the patch titled

thermal: exynos: Fix unbalanced regulator disable on probe failure

to my thermal-soc git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
in the linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will also be merged in the next major kernel release during the merge window.

If you have any questions about this process, please let me know.

All the best,

Eduardo Valentin

----------

Quoted 1 line

From 824ead03b78403a21449cb7eb153a4344cd3b4c8 Mon Sep 17 00:00:00 2001

From: Krzysztof Kozlowski <[email protected]>
Date: Thu, 8 Oct 2015 14:34:02 +0900
Subject: 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 Lukasz Majewski <[email protected]>
Tested-by Lukasz Majewski <[email protected]>
Reviewed-by Alim Akhtar <[email protected]>
Signed-off-by Krzysztof Kozlowski <[email protected]>
Fixes 5f09a5cbd14a ("thermal: exynos: Disable the regulator on probe failure")
Cc <[email protected]>
Signed-off-by Eduardo Valentin <[email protected]>
---
 drivers/thermal/samsung/exynos_tmu.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/thermal/samsung/exynos_tmu.c +17 -17
index 0bae8cc..23f4320 100644
@@ -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_platform_data *pdata;
 	struct resource res;
-	int ret;
 
 	if (!data || !pdev->dev.of_node)
 		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");
 	if (data->id < 0)
 		data->id = 0;

@@ -1312,6 +1295,23 @@ static int exynos_tmu_probe(struct platform_device *pdev)
 		pr_err("thermal: tz: %p ERROR\n", 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);
 	if (ret)
 		goto err_sensor;
Signature · 1 line
2.5.0