lkml.org 
[lkml]   [2020]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 148/388] gpio: mlxbf2: fix return value check in mlxbf2_gpio_get_lock_res()
    Date
    From: Wei Yongjun <weiyongjun1@huawei.com>

    [ 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 | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpio/gpio-mlxbf2.c b/drivers/gpio/gpio-mlxbf2.c
    index da570e63589d..cc0dd8593a4b 100644
    --- a/drivers/gpio/gpio-mlxbf2.c
    +++ b/drivers/gpio/gpio-mlxbf2.c
    @@ -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);
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-18 04:42    [W:3.886 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site