summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/i8042-io.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-09-04 08:41:38 +0200
committerDmitry Torokhov <dtor_core@ameritech.net>2005-09-04 08:41:38 +0200
commit8d5987a6e17fa36776a0c9964db0f24c3d070862 (patch)
treefcabd9919c13d7d7eb3b77b09de852488ab7d13d /drivers/input/serio/i8042-io.h
parentInput: i8042 - clean up initialization code; abort if we (diff)
downloadlinux-8d5987a6e17fa36776a0c9964db0f24c3d070862.tar.xz
linux-8d5987a6e17fa36776a0c9964db0f24c3d070862.zip
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.h6
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)
*/
#if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__) && !defined(CONFIG_PPC64)
if (!request_region(I8042_DATA_REG, 16, "i8042"))
- return -1;
+ return -EBUSY;
#endif
i8042_reset = 1;
#if defined(CONFIG_PPC64)
if (check_legacy_ioport(I8042_DATA_REG))
- return -1;
+ return -EBUSY;
if (!request_region(I8042_DATA_REG, 16, "i8042"))
- return -1;
+ return -EBUSY;
#endif
return 0;
}