diff options
| author | Michael Schmitz <schmitz@biophys.uni-duesseldorf.de> | 2008-12-28 23:00:45 +0100 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-05-19 18:19:11 +0200 |
| commit | 186f200a95cbd13c291cdd3ddeb07aad0a3782cc (patch) | |
| tree | 426de0e7ecc259e696b2c4504a015668a95d889a /drivers | |
| parent | 7786908c3c1bb38dcc5cd2c037251c05507eef16 (diff) | |
| download | linux-3.10-186f200a95cbd13c291cdd3ddeb07aad0a3782cc.tar.gz linux-3.10-186f200a95cbd13c291cdd3ddeb07aad0a3782cc.tar.bz2 linux-3.10-186f200a95cbd13c291cdd3ddeb07aad0a3782cc.zip | |
input/atari: Fix atarimouse init
Atarimouse fails to load as a module (with ENODEV), due to a brown paper
bag bug, misinterpreting the semantics of atari_keyb_init().
[geert] Propagate the return value of atari_keyb_init() everywhere
Signed-off-by: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/keyboard/atakbd.c | 5 | ||||
| -rw-r--r-- | drivers/input/mouse/atarimouse.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/input/keyboard/atakbd.c b/drivers/input/keyboard/atakbd.c index 1839194ea98..10bcd4ae540 100644 --- a/drivers/input/keyboard/atakbd.c +++ b/drivers/input/keyboard/atakbd.c @@ -223,8 +223,9 @@ static int __init atakbd_init(void) return -ENODEV; // need to init core driver if not already done so - if (atari_keyb_init()) - return -ENODEV; + error = atari_keyb_init(); + if (error) + return error; atakbd_dev = input_allocate_device(); if (!atakbd_dev) diff --git a/drivers/input/mouse/atarimouse.c b/drivers/input/mouse/atarimouse.c index a57143ce80b..16a9d0ffab8 100644 --- a/drivers/input/mouse/atarimouse.c +++ b/drivers/input/mouse/atarimouse.c @@ -118,8 +118,9 @@ static int __init atamouse_init(void) if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP)) return -ENODEV; - if (!atari_keyb_init()) - return -ENODEV; + error = atari_keyb_init(); + if (error) + return error; atamouse_dev = input_allocate_device(); if (!atamouse_dev) |