diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2017-10-19 19:05:45 +0200 |
|---|---|---|
| committer | Eduardo Valentin <edubezval@gmail.com> | 2017-10-31 19:32:15 -0700 |
| commit | 2cb4de785c40d4a2132cfc13e63828f5a28c3351 (patch) | |
| tree | 5e302954d12bfd9cd693a1d102aaf9df4e273e44 /drivers/thermal | |
| parent | ff4ec2997df8fe7cc40513dbe5f86d9f88fb6be7 (diff) | |
| download | linux-2cb4de785c40d4a2132cfc13e63828f5a28c3351.tar.gz linux-2cb4de785c40d4a2132cfc13e63828f5a28c3351.tar.bz2 linux-2cb4de785c40d4a2132cfc13e63828f5a28c3351.zip | |
thermal/drivers/hisi: Fix kernel panic on alarm interrupt
The threaded interrupt for the alarm interrupt is requested before the
temperature controller is setup. This one can fire an interrupt immediately
leading to a kernel panic as the sensor data is not initialized.
In order to prevent that, move the threaded irq after the Tsensor is setup.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Leo Yan <leo.yan@linaro.org>
Tested-by: Leo Yan <leo.yan@linaro.org>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/hisi_thermal.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index 725d0d434d83..f69aea0b2fe3 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -287,15 +287,6 @@ static int hisi_thermal_probe(struct platform_device *pdev) if (data->irq < 0) return data->irq; - ret = devm_request_threaded_irq(&pdev->dev, data->irq, - hisi_thermal_alarm_irq, - hisi_thermal_alarm_irq_thread, - 0, "hisi_thermal", data); - if (ret < 0) { - dev_err(&pdev->dev, "failed to request alarm irq: %d\n", ret); - return ret; - } - platform_set_drvdata(pdev, data); data->clk = devm_clk_get(&pdev->dev, "thermal_clk"); @@ -328,6 +319,15 @@ static int hisi_thermal_probe(struct platform_device *pdev) hisi_thermal_toggle_sensor(&data->sensors, true); + ret = devm_request_threaded_irq(&pdev->dev, data->irq, + hisi_thermal_alarm_irq, + hisi_thermal_alarm_irq_thread, + 0, "hisi_thermal", data); + if (ret < 0) { + dev_err(&pdev->dev, "failed to request alarm irq: %d\n", ret); + return ret; + } + enable_irq(data->irq); return 0; |