diff options
| author | Jean-Christophe Dubois <jcd@tribudubois.net> | 2018-07-01 00:10:50 +0200 |
|---|---|---|
| committer | Eduardo Valentin <edubezval@gmail.com> | 2018-07-02 19:34:33 +0200 |
| commit | be926ceeb4efc3bf44cb9b56f5c71aac9b1f8bbe (patch) | |
| tree | bdc0c11301d9f3a5c4b03f125951f2834d358e83 /drivers/thermal/imx_thermal.c | |
| parent | Linux 4.18-rc3 (diff) | |
| download | linux-be926ceeb4efc3bf44cb9b56f5c71aac9b1f8bbe.tar.xz linux-be926ceeb4efc3bf44cb9b56f5c71aac9b1f8bbe.zip | |
thermal: i.MX: Allow thermal probe to fail gracefully in case of bad calibration.
Without this fix, the thermal probe on i.MX6 might trigger a division
by zero exception later in the probe if the calibration does fail.
Note: This linux behavior (Division by zero in kernel) has been triggered
on a Qemu i.MX6 emulation where parameters in nvmem were not set. With this
fix the division by zero is not triggeed anymore as the thermal probe does
fail early.
Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Diffstat (limited to 'drivers/thermal/imx_thermal.c')
| -rw-r--r-- | drivers/thermal/imx_thermal.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index 334d98be03b9..b1f82d64253e 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -604,7 +604,10 @@ static int imx_init_from_nvmem_cells(struct platform_device *pdev) ret = nvmem_cell_read_u32(&pdev->dev, "calib", &val); if (ret) return ret; - imx_init_calib(pdev, val); + + ret = imx_init_calib(pdev, val); + if (ret) + return ret; ret = nvmem_cell_read_u32(&pdev->dev, "temp_grade", &val); if (ret) |