diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-04 02:41:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-04 02:41:38 -0400 |
| commit | 8d5987a6e17fa36776a0c9964db0f24c3d070862 (patch) | |
| tree | fcabd9919c13d7d7eb3b77b09de852488ab7d13d /drivers/input/serio/i8042.c | |
| parent | 0854e52d86080c1043bc8988daef2ebda4775f64 (diff) | |
Input: make i8042_platform_init return 'real' error code
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio/i8042.c')
| -rw-r--r-- | drivers/input/serio/i8042.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index f0d9c5f9cc36..2a76d08c4d3e 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c | |||
| @@ -1066,8 +1066,9 @@ static int __init i8042_init(void) | |||
| 1066 | init_timer(&i8042_timer); | 1066 | init_timer(&i8042_timer); |
| 1067 | i8042_timer.function = i8042_timer_func; | 1067 | i8042_timer.function = i8042_timer_func; |
| 1068 | 1068 | ||
| 1069 | if (i8042_platform_init()) | 1069 | err = i8042_platform_init(); |
| 1070 | return -EBUSY; | 1070 | if (err) |
| 1071 | return err; | ||
| 1071 | 1072 | ||
| 1072 | i8042_ports[I8042_AUX_PORT_NO].irq = I8042_AUX_IRQ; | 1073 | i8042_ports[I8042_AUX_PORT_NO].irq = I8042_AUX_IRQ; |
| 1073 | i8042_ports[I8042_KBD_PORT_NO].irq = I8042_KBD_IRQ; | 1074 | i8042_ports[I8042_KBD_PORT_NO].irq = I8042_KBD_IRQ; |