aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/keyboard.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2006-09-14 01:32:39 -0400
committerDmitry Torokhov <dtor@insightbb.com>2006-09-14 01:32:39 -0400
commit4263cf0fac28122c8381b6f4f9441a43cd93c81f (patch)
tree2abdac5c34cf584854677b33e5dcd0e343ee1611 /drivers/char/keyboard.c
parentInput: remove cruft that was needed for transition to sysfs (diff)
downloadlinux-dev-4263cf0fac28122c8381b6f4f9441a43cd93c81f.tar.xz
linux-dev-4263cf0fac28122c8381b6f4f9441a43cd93c81f.zip
Input: make input_register_handler() return error codes
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/char/keyboard.c')
-rw-r--r--drivers/char/keyboard.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 797480768b4e..bf2339c869ea 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -1362,6 +1362,7 @@ static struct input_handler kbd_handler = {
int __init kbd_init(void)
{
int i;
+ int error;
for (i = 0; i < MAX_NR_CONSOLES; i++) {
kbd_table[i].ledflagstate = KBD_DEFLEDS;
@@ -1373,7 +1374,9 @@ int __init kbd_init(void)
kbd_table[i].kbdmode = VC_XLATE;
}
- input_register_handler(&kbd_handler);
+ error = input_register_handler(&kbd_handler);
+ if (error)
+ return error;
tasklet_enable(&keyboard_tasklet);
tasklet_schedule(&keyboard_tasklet);