redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Wei Yongjun 2016-07-30 06:32:37 +00:00 committed by Zhang Rui
parent 5ef62de751
commit 809eb35045
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/thermal/qcom/tsens-common.c
View File

@ -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;