summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2012-10-18 08:55:34 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-10-18 08:58:56 +0200
commit197a1e96c8be5b6005145af3a4c0e45e2d651444 (patch)
tree5663b8dde5bef8a83dff8eb3c9af98ae62216d87 /drivers/input/serio
parentInput: mms114 - add device tree bindings (diff)
downloadlinux-197a1e96c8be5b6005145af3a4c0e45e2d651444.tar.xz
linux-197a1e96c8be5b6005145af3a4c0e45e2d651444.zip
Input: i8042-io - fix up region handling on MIPS
i8042_platform_init() skips reguest_region() on MIPS, but in i8042_platform_exit() release_region() is still called. Fix this by reserving the region also on MIPS. The patch eliminates the following error message seen on MIPS: [ 2.112000] Trying to free nonexistent resource <0000000000000060-000000000000006f> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/serio')
-rw-r--r--drivers/input/serio/i8042-io.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
index 5d48bb66aa73..a5eed2ade53d 100644
--- a/drivers/input/serio/i8042-io.h
+++ b/drivers/input/serio/i8042-io.h
@@ -76,7 +76,7 @@ static inline int i8042_platform_init(void)
if (check_legacy_ioport(I8042_DATA_REG))
return -ENODEV;
#endif
-#if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__)
+#if !defined(__sh__) && !defined(__alpha__)
if (!request_region(I8042_DATA_REG, 16, "i8042"))
return -EBUSY;
#endif