Re: [PATCH -next] thermal: qcom: tsens: Fix return value check in init_common()
From: Zhang Rui <rui.zhang@intel.com>
Date: 2016-08-19 13:16:11
On 六, 2016-07-30 at 00:32 -0600, Wei Yongjun wrote:
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 <redacted>
Patch applied. thanks, rui
quoted hunk ↗ jump to hunk
--- drivers/thermal/qcom/tsens-common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)diff --git a/drivers/thermal/qcom/tsens-common.cb/drivers/thermal/qcom/tsens-common.c index 4a1af15..b1449ad 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;