Эх сурвалжийг харах

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>
Jean-Christophe Dubois 7 жил өмнө
parent
commit
be926ceeb4

+ 4 - 1
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);
 	ret = nvmem_cell_read_u32(&pdev->dev, "calib", &val);
 	if (ret)
 	if (ret)
 		return 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);
 	ret = nvmem_cell_read_u32(&pdev->dev, "temp_grade", &val);
 	if (ret)
 	if (ret)