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

Commit 84866ee5 authored by Bai Ping's avatar Bai Ping Committed by Eduardo Valentin
Browse files

thermal: imx: register irq handler later in probe 



The irq handler should be registered after the tempmon
module has been initialized in a known state and the
thermal_zone and cpu_cooling device have been registered
successfully. Otherwise, if the irq is triggled earlier
before thermal probe has been finished, it may lead to
'NULL' pointer kernel panic.

Signed-off-by: default avatarBai Ping <b51503@freescale.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 452e01b3

drivers/thermal/imx_thermal.c

+11 −8
Original line number Diff line number Diff line
@@ -487,14 +487,6 @@ static int imx_thermal_probe(struct platform_device *pdev) 
	if (data->irq < 0)

		return data->irq;



	ret = devm_request_threaded_irq(&pdev->dev, data->irq,

			imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,

			0, "imx_thermal", data);

	if (ret < 0) {

		dev_err(&pdev->dev, "failed to request alarm irq: %d\n", ret);

		return ret;

	}



	platform_set_drvdata(pdev, data);



	ret = imx_get_sensor_data(pdev);
@@ -571,6 +563,17 @@ 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);



	ret = devm_request_threaded_irq(&pdev->dev, data->irq,

			imx_thermal_alarm_irq, imx_thermal_alarm_irq_thread,

			0, "imx_thermal", data);

	if (ret < 0) {

		dev_err(&pdev->dev, "failed to request alarm irq: %d\n", ret);

		clk_disable_unprepare(data->thermal_clk);

		thermal_zone_device_unregister(data->tz);

		cpufreq_cooling_unregister(data->cdev);

		return ret;

	}



	data->irq_enabled = true;

	data->mode = THERMAL_DEVICE_ENABLED;