diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 08:51:09 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 08:51:09 -0400 |
| commit | 14f4b0e1f49c8a85a45caeb257d1fc747d829163 (patch) | |
| tree | c50a819eb5c380e44eb130799307ad015a301689 | |
| parent | 7b16fd13ac23d0b82908216a3388714ee133d586 (diff) | |
| download | longterm-queue-4.12-14f4b0e1f49c8a85a45caeb257d1fc747d829163.tar.gz | |
thermal: refresh ctxt
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/thermal-drivers-hisi-Fix-kernel-panic-on-alarm-inter.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/queue/thermal-drivers-hisi-Fix-kernel-panic-on-alarm-inter.patch b/queue/thermal-drivers-hisi-Fix-kernel-panic-on-alarm-inter.patch index 7f375f4..ac42012 100644 --- a/queue/thermal-drivers-hisi-Fix-kernel-panic-on-alarm-inter.patch +++ b/queue/thermal-drivers-hisi-Fix-kernel-panic-on-alarm-inter.patch @@ -1,4 +1,4 @@ -From 2cb4de785c40d4a2132cfc13e63828f5a28c3351 Mon Sep 17 00:00:00 2001 +From c477bf6956a64e7987e051de4f16373aad937921 Mon Sep 17 00:00:00 2001 From: Daniel Lezcano <daniel.lezcano@linaro.org> Date: Thu, 19 Oct 2017 19:05:45 +0200 Subject: [PATCH] thermal/drivers/hisi: Fix kernel panic on alarm interrupt @@ -15,12 +15,13 @@ 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> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c -index 725d0d434d83..f69aea0b2fe3 100644 +index 3fa13a71764b..315987b6a280 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) +@@ -317,15 +317,6 @@ static int hisi_thermal_probe(struct platform_device *pdev) if (data->irq < 0) return data->irq; @@ -36,9 +37,9 @@ index 725d0d434d83..f69aea0b2fe3 100644 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); +@@ -357,6 +348,15 @@ static int hisi_thermal_probe(struct platform_device *pdev) + hisi_thermal_toggle_sensor(&data->sensors[i], true); + } + ret = devm_request_threaded_irq(&pdev->dev, data->irq, + hisi_thermal_alarm_irq, |