diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2007-10-15 15:51:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 16:08:55 -0400 |
commit | 63bd8c48e04bbbc9cee3d752857914609d8d406f (patch) | |
tree | ac3e4b4c9de04666aa73aaeb88bcb92b80937a4a | |
parent | 355aaffdaf82c95a004daedd1ea64fc61a25b8db (diff) |
Atari keyboard: incorporate additional review comments
Atari keyboard: incorporate additional review comments:
o Kill reference to source file name
o Return error value from input_register_device() instead of -ENOMEM
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Michael Schmitz <schmitz@biophys.uni-duesseldorf.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/m68k/atari/atakeyb.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/atakbd.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c index fbbccb5e7511..880add120eb3 100644 --- a/arch/m68k/atari/atakeyb.c +++ b/arch/m68k/atari/atakeyb.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/m68k/atari/atakeyb.c | ||
3 | * | ||
4 | * Atari Keyboard driver for 680x0 Linux | 2 | * Atari Keyboard driver for 680x0 Linux |
5 | * | 3 | * |
6 | * This file is subject to the terms and conditions of the GNU General Public | 4 | * This file is subject to the terms and conditions of the GNU General Public |
diff --git a/drivers/input/keyboard/atakbd.c b/drivers/input/keyboard/atakbd.c index f948d3a14a93..a1800151b6ce 100644 --- a/drivers/input/keyboard/atakbd.c +++ b/drivers/input/keyboard/atakbd.c | |||
@@ -217,7 +217,7 @@ static void atakbd_interrupt(unsigned char scancode, char down) | |||
217 | 217 | ||
218 | static int __init atakbd_init(void) | 218 | static int __init atakbd_init(void) |
219 | { | 219 | { |
220 | int i; | 220 | int i, error; |
221 | 221 | ||
222 | if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP)) | 222 | if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP)) |
223 | return -EIO; | 223 | return -EIO; |
@@ -247,9 +247,10 @@ static int __init atakbd_init(void) | |||
247 | } | 247 | } |
248 | 248 | ||
249 | /* error check */ | 249 | /* error check */ |
250 | if (input_register_device(atakbd_dev)) { | 250 | error = input_register_device(atakbd_dev); |
251 | if (error) { | ||
251 | input_free_device(atakbd_dev); | 252 | input_free_device(atakbd_dev); |
252 | return -ENOMEM; | 253 | return error; |
253 | } | 254 | } |
254 | 255 | ||
255 | atari_input_keyboard_interrupt_hook = atakbd_interrupt; | 256 | atari_input_keyboard_interrupt_hook = atakbd_interrupt; |