thermal: qcom: tsens: Fix return value check in init_common()
authorWei Yongjun <weiyj.lk@gmail.com>
Sat, 30 Jul 2016 06:32:37 +0000 (06:32 +0000)
committerZhang Rui <rui.zhang@intel.com>
Tue, 27 Sep 2016 06:02:16 +0000 (14:02 +0800)
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>
drivers/thermal/qcom/tsens-common.c

index 4a1af151bd535903bdb3487f74947675c02c31ac..b1449ad67fc0a13b9ea35ec2086aaaf3c1b36c1e 100644 (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;