summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2018-04-13 09:11:53 +0300
committerZhang Rui <rui.zhang@intel.com>2018-04-13 09:11:53 +0300
commitb907b408ca64482989cd95dacef804ce509a3673 (patch)
tree3c9a139b01367788f50cc3fcefb5d042d6051402 /drivers
parent8ea229511e06f9635ecc338dcbe0db41a73623f0 (diff)
parentcf1ba1d73a33944d8c1a75370a35434bf146b8a7 (diff)
downloadlinux-b907b408ca64482989cd95dacef804ce509a3673.tar.xz
Merge branches 'thermal-core' and 'thermal-soc' into next
Diffstat (limited to 'drivers')
-rw-r--r--drivers/thermal/imx_thermal.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index a67781b7a0b2..ee3a215b333a 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -637,6 +637,9 @@ static int imx_thermal_probe(struct platform_device *pdev)
regmap_write(map, TEMPSENSE0 + REG_CLR, TEMPSENSE0_POWER_DOWN);
regmap_write(map, TEMPSENSE0 + REG_SET, TEMPSENSE0_MEASURE_TEMP);
+ data->irq_enabled = true;
+ data->mode = THERMAL_DEVICE_ENABLED;
+
ret = devm_request_threaded_irq(&pdev->dev, data->irq,
imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,
0, "imx_thermal", data);
@@ -649,9 +652,6 @@ static int imx_thermal_probe(struct platform_device *pdev)
return ret;
}
- data->irq_enabled = true;
- data->mode = THERMAL_DEVICE_ENABLED;
-
return 0;
}