projects
/
linux
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
[linux]
/
drivers
/
thermal
/
imx_thermal.c
diff --git
a/drivers/thermal/imx_thermal.c
b/drivers/thermal/imx_thermal.c
index
cbfcca8
..
aa452ac
100644
(file)
--- a/
drivers/thermal/imx_thermal.c
+++ b/
drivers/thermal/imx_thermal.c
@@
-605,7
+605,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;
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)
ret = nvmem_cell_read_u32(&pdev->dev, "temp_grade", &val);
if (ret)