git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
joystick
/
n64joy.c
diff --git
a/drivers/input/joystick/n64joy.c
b/drivers/input/joystick/n64joy.c
index 8bcc529942bc3e2d7adc42c1e0246e3e0ffbd093..9dbca366613e575983f785a1d2459f1d68a7f65d 100644
(file)
--- 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);
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;
}
goto fail;
}