From: Jean-Christophe Dubois Date: Sat, 30 Jun 2018 22:10:50 +0000 (+0200) Subject: thermal: i.MX: Allow thermal probe to fail gracefully in case of bad calibration. X-Git-Tag: v4.19-rc1~119^2~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be926ceeb4efc3bf44cb9b56f5c71aac9b1f8bbe;p=thirdparty%2Fkernel%2Flinux.git 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 Reviewed-by: Fabio Estevam Signed-off-by: Eduardo Valentin --- diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index 334d98be03b99..b1f82d64253e1 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)