Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf826c57 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Greg Kroah-Hartman
Browse files

thermal/drivers/hisi: Fix kernel panic on alarm interrupt 



commit 2cb4de78 upstream.

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: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: default avatarLeo Yan <leo.yan@linaro.org>
Tested-by: default avatarLeo Yan <leo.yan@linaro.org>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
Signed-off-by: default avatarKevin Wangtao <kevin.wangtao@hisilicon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7254834c

drivers/thermal/hisi_thermal.c

+9 −9
Original line number Diff line number Diff line
@@ -317,15 +317,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");
@@ -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,

					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;