summaryrefslogtreecommitdiff
path: root/drivers/thermal
diff options
context:
space:
mode:
authorWei Yongjun <weiyj.lk@gmail.com>2016-07-30 09:32:37 +0300
committerZhang Rui <rui.zhang@intel.com>2016-09-27 09:02:16 +0300
commit809eb35045097bc7da56fa8bba1f6b4cd1b721ba (patch)
tree986d64eb56bb0bdfe8ae0a34112c33968a1ef9ec /drivers/thermal
parent5ef62de751dcd21b3853368ab47eedcbc1cf3475 (diff)
downloadlinux-809eb35045097bc7da56fa8bba1f6b4cd1b721ba.tar.xz
thermal: qcom: tsens: Fix return value check in init_common()
In case of error, the function of_iomap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. And the function devm_regmap_init_mmio() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> Acked-by: Rajendra Nayak <rnayak@codeaurora.org> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/qcom/tsens-common.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
index 4a1af151bd53..b1449ad67fc0 100644
--- a/drivers/thermal/qcom/tsens-common.c
+++ b/drivers/thermal/qcom/tsens-common.c
@@ -128,13 +128,13 @@ int __init init_common(struct tsens_device *tmdev)
void __iomem *base;
base = of_iomap(tmdev->dev->of_node, 0);
- if (IS_ERR(base))
+ if (!base)
return -EINVAL;
tmdev->map = devm_regmap_init_mmio(tmdev->dev, base, &tsens_config);
- if (!tmdev->map) {
+ if (IS_ERR(tmdev->map)) {
iounmap(base);
- return -ENODEV;
+ return PTR_ERR(tmdev->map);
}
return 0;