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 @@
 /*
- * 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
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)
 
 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;