diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2020-05-25 11:16:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-05-26 00:02:42 +0200 |
| commit | 97a2f40e3801905c7221df8ce2f2231632ce8ce4 (patch) | |
| tree | cc4364cb07cad7432a14d84f6c90558736f0ea36 /drivers/bus | |
| parent | 9d281a4f6fd61341da2fd08bf0b9449ed72b40e3 (diff) | |
| download | linux-97a2f40e3801905c7221df8ce2f2231632ce8ce4.tar.gz linux-97a2f40e3801905c7221df8ce2f2231632ce8ce4.tar.bz2 linux-97a2f40e3801905c7221df8ce2f2231632ce8ce4.zip | |
bus: arm-integrator-lm: Fix return value check in integrator_ap_lm_probe()
In case of error, the function of_find_matching_node() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.
Link: https://lore.kernel.org/r/20200525091634.8274-1-linus.walleij@linaro.org
Fixes: ccea5e8a5918 ("bus: Add driver for Integrator/AP logic modules")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Link: https://lore.kernel.org/r/20200520032150.165388-1-weiyongjun1@huawei.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/arm-integrator-lm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bus/arm-integrator-lm.c b/drivers/bus/arm-integrator-lm.c index 669ea7e1f92e..845b6c43fef8 100644 --- a/drivers/bus/arm-integrator-lm.c +++ b/drivers/bus/arm-integrator-lm.c @@ -78,10 +78,10 @@ static int integrator_ap_lm_probe(struct platform_device *pdev) /* Look up the system controller */ syscon = of_find_matching_node(NULL, integrator_ap_syscon_match); - if (IS_ERR(syscon)) { + if (!syscon) { dev_err(dev, "could not find Integrator/AP system controller\n"); - return PTR_ERR(syscon); + return -ENODEV; } map = syscon_node_to_regmap(syscon); if (IS_ERR(map)) { |