summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis Yu <louis.yu@mediatek.com>2017-08-01 09:28:33 +0200
committerZhang Rui <rui.zhang@intel.com>2017-08-31 15:13:53 +0200
commit6760f3f74e72d690bc47b8a1ca1716d2f2e4ad74 (patch)
treeac0ae756d521e8d34bfd34fdfaf5c83edecdf608
parentthermal: mediatek: extend calibration data for mt2712 chip (diff)
downloadlinux-6760f3f74e72d690bc47b8a1ca1716d2f2e4ad74.tar.xz
linux-6760f3f74e72d690bc47b8a1ca1716d2f2e4ad74.zip
thermal: mediatek: minor mtk_thermal.c cleanups
Move independent thermal module reset in the beginning. Signed-off-by: Louis Yu <louis.yu@mediatek.com> Reviewed-by: Dawei Chien <dawei.chien@mediatek.com> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
-rw-r--r--drivers/thermal/mtk_thermal.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
index b609589698c7..1e61c09153c9 100644
--- a/drivers/thermal/mtk_thermal.c
+++ b/drivers/thermal/mtk_thermal.c
@@ -712,16 +712,16 @@ static int mtk_thermal_probe(struct platform_device *pdev)
return -EINVAL;
}
+ ret = device_reset(&pdev->dev);
+ if (ret)
+ return ret;
+
ret = clk_prepare_enable(mt->clk_auxadc);
if (ret) {
dev_err(&pdev->dev, "Can't enable auxadc clk: %d\n", ret);
return ret;
}
- ret = device_reset(&pdev->dev);
- if (ret)
- goto err_disable_clk_auxadc;
-
ret = clk_prepare_enable(mt->clk_peri_therm);
if (ret) {
dev_err(&pdev->dev, "Can't enable peri clk: %d\n", ret);