diff options
| author |   Wei Yongjun <weiyongjun1@huawei.com> | 2021-03-08 11:40:30 -0800 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-03-09 21:41:28 -0800 |
| commit | 2d8aaa1720c6128ce263a2afcd3f8ee2e5551af8 (patch) | |
| tree | c94d5b9390a97335fcaff1393a5f676ca9f842ae /drivers/input/joystick | |
| parent | Input: s6sy761 - fix coordinate read bit shift (diff) | |
| download | linux-dev-2d8aaa1720c6128ce263a2afcd3f8ee2e5551af8.tar.xz linux-dev-2d8aaa1720c6128ce263a2afcd3f8ee2e5551af8.zip | |
Input: n64joy - fix return value check in n64joy_probe()
In case of error, the function devm_platform_ioremap_resource()
returns ERR_PTR() and never returns NULL. The NULL test in the
return value check should be replaced with IS_ERR().
Fixes: 3bdffa8ffb45 ("Input: Add N64 controller driver")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Lauri Kasanen <cand@gmx.com>
Link: https://lore.kernel.org/r/20210308122856.2177071-1-weiyongjun1@huawei.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/n64joy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/joystick/n64joy.c b/drivers/input/joystick/n64joy.c index 8bcc529942bc..9dbca366613e 100644 --- a/drivers/input/joystick/n64joy.c +++ b/drivers/input/joystick/n64joy.c @@ -252,8 +252,8 @@ static int __init n64joy_probe(struct platform_device *pdev) mutex_init(&priv->n64joy_mutex); priv->reg_base = devm_platform_ioremap_resource(pdev, 0); - if (!priv->reg_base) { - err = -EINVAL; + if (IS_ERR(priv->reg_base)) { + err = PTR_ERR(priv->reg_base); goto fail; } |