| From c176b10b025acee4dc8f2ab1cd64eb73b5ccef53 Mon Sep 17 00:00:00 2001 |
| From: Daniel Lezcano <daniel.lezcano@linaro.org> |
| Date: Thu, 19 Oct 2017 19:05:43 +0200 |
| Subject: thermal/drivers/hisi: Fix missing interrupt enablement |
| |
| From: Daniel Lezcano <daniel.lezcano@linaro.org> |
| |
| commit c176b10b025acee4dc8f2ab1cd64eb73b5ccef53 upstream. |
| |
| The interrupt for the temperature threshold is not enabled at the end of the |
| probe function, enable it after the setup is complete. |
| |
| On the other side, the irq_enabled is not correctly set as we are checking if |
| the interrupt is masked where 'yes' means irq_enabled=false. |
| |
| irq_get_irqchip_state(data->irq, IRQCHIP_STATE_MASKED, |
| &data->irq_enabled); |
| |
| As we are always enabling the interrupt, it is pointless to check if |
| the interrupt is masked or not, just set irq_enabled to 'true'. |
| |
| 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: Kevin Wangtao <kevin.wangtao@hisilicon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/thermal/hisi_thermal.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/thermal/hisi_thermal.c |
| +++ b/drivers/thermal/hisi_thermal.c |
| @@ -345,8 +345,7 @@ static int hisi_thermal_probe(struct pla |
| } |
| |
| hisi_thermal_enable_bind_irq_sensor(data); |
| - irq_get_irqchip_state(data->irq, IRQCHIP_STATE_MASKED, |
| - &data->irq_enabled); |
| + data->irq_enabled = true; |
| |
| for (i = 0; i < HISI_MAX_SENSORS; ++i) { |
| ret = hisi_thermal_register_sensor(pdev, data, |
| @@ -358,6 +357,8 @@ static int hisi_thermal_probe(struct pla |
| hisi_thermal_toggle_sensor(&data->sensors[i], true); |
| } |
| |
| + enable_irq(data->irq); |
| + |
| return 0; |
| } |
| |
