diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-05-25 11:24:42 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-05-25 11:24:42 -0700 |
commit | cbb245239282870bc6f54d5137dfe0f84b48ea72 (patch) | |
tree | dcdd8041d7bb5cddacfe086785dd370aa1a7a6ea /drivers/input/joystick/n64joy.c | |
parent | Input: ims-pcu - replace some spaces with tabs (diff) | |
parent | Linux 5.12 (diff) | |
download | linux-dev-cbb245239282870bc6f54d5137dfe0f84b48ea72.tar.xz linux-dev-cbb245239282870bc6f54d5137dfe0f84b48ea72.zip |
Merge tag 'v5.12' into next
Sync up with mainline to get the latest device tree bindings and kernel
APIs.
Diffstat (limited to 'drivers/input/joystick/n64joy.c')
-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; } |