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 <[email protected]>
Cc: Dmitry Torokhov <[email protected]>
Cc: Michael Schmitz <[email protected]>
---
arch/m68k/atari/atakeyb.c | 2 --
drivers/input/keyboard/atakbd.c | 7 ++++---
2 files changed, 4 insertions(+), 5 deletions(-)
--- a/arch/m68k/atari/atakeyb.c
+++ b/arch/m68k/atari/atakeyb.c
@@ -1,6 +1,4 @@
/*
- * linux/arch/m68k/atari/atakeyb.c
- *
* Atari Keyboard driver for 680x0 Linux
*
* This file is subject to the terms and conditions of the GNU General Public
--- a/drivers/input/keyboard/atakbd.c
+++ b/drivers/input/keyboard/atakbd.c
@@ -217,7 +217,7 @@ static void atakbd_interrupt(unsigned ch
static int __init atakbd_init(void)
{
- int i;
+ int i, error;
if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP))
return -EIO;
@@ -247,9 +247,10 @@ static int __init atakbd_init(void)
}
/* error check */
- if (input_register_device(atakbd_dev)) {
+ error = input_register_device(atakbd_dev);
+ if (error) {
input_free_device(atakbd_dev);
- return -ENOMEM;
+ return error;
}
atari_input_keyboard_interrupt_hook = atakbd_interrupt;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On Mon, 15 Oct 2007, Geert Uytterhoeven wrote:
> 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 <[email protected]>
> Cc: Dmitry Torokhov <[email protected]>
> Cc: Michael Schmitz <[email protected]>
Ack, Ack ...
Thanks, Geert! Can't wait to get my Falcon back outta the container ...
Michael