]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
gpio: mlxbf2: fix return value check in mlxbf2_gpio_get_lock_res()
authorWei Yongjun <weiyongjun1@huawei.com>
Mon, 27 Apr 2020 11:08:29 +0000 (11:08 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Jun 2020 15:48:37 +0000 (17:48 +0200)
[ Upstream commit 66d8ad67aab3bc6f55e7de81565cd0d4875bd851 ]

In case of error, the function devm_ioremap() returns NULL pointer not
ERR_PTR(). The IS_ERR() test in the return value check should be
replaced with NULL test.

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Link: https://lore.kernel.org/r/20200427110829.154785-1-weiyongjun1@huawei.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpio/gpio-mlxbf2.c

index da570e63589d09896a6bfb9d7c24811604b0a5d8..cc0dd8593a4badfc66a392f68b38ed90c9b65bc6 100644 (file)
@@ -110,8 +110,8 @@ static int mlxbf2_gpio_get_lock_res(struct platform_device *pdev)
        }
 
        yu_arm_gpio_lock_param.io = devm_ioremap(dev, res->start, size);
-       if (IS_ERR(yu_arm_gpio_lock_param.io))
-               ret = PTR_ERR(yu_arm_gpio_lock_param.io);
+       if (!yu_arm_gpio_lock_param.io)
+               ret = -ENOMEM;
 
 exit:
        mutex_unlock(yu_arm_gpio_lock_param.lock);