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-io.h | |
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-io.h')
-rw-r--r-- | drivers/input/serio/i8042-io.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h index c9e633d21d90..9a9221644250 100644 --- a/drivers/input/serio/i8042-io.h +++ b/drivers/input/serio/i8042-io.h | |||
@@ -69,16 +69,16 @@ static inline int i8042_platform_init(void) | |||
69 | */ | 69 | */ |
70 | #if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__) && !defined(CONFIG_PPC64) | 70 | #if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__) && !defined(CONFIG_PPC64) |
71 | if (!request_region(I8042_DATA_REG, 16, "i8042")) | 71 | if (!request_region(I8042_DATA_REG, 16, "i8042")) |
72 | return -1; | 72 | return -EBUSY; |
73 | #endif | 73 | #endif |
74 | 74 | ||
75 | i8042_reset = 1; | 75 | i8042_reset = 1; |
76 | 76 | ||
77 | #if defined(CONFIG_PPC64) | 77 | #if defined(CONFIG_PPC64) |
78 | if (check_legacy_ioport(I8042_DATA_REG)) | 78 | if (check_legacy_ioport(I8042_DATA_REG)) |
79 | return -1; | 79 | return -EBUSY; |
80 | if (!request_region(I8042_DATA_REG, 16, "i8042")) | 80 | if (!request_region(I8042_DATA_REG, 16, "i8042")) |
81 | return -1; | 81 | return -EBUSY; |
82 | #endif | 82 | #endif |
83 | return 0; | 83 | return 0; |
84 | } | 84 | } |