diff options
| author |   Markus Armbruster <armbru@pond.sub.org> | 2007-07-18 01:20:41 -0400 |
|---|---|---|
| committer |   Dmitry Torokhov <dtor@insightbb.com> | 2007-07-18 01:20:41 -0400 |
| commit | 018db6bb0d726c3683a5e1eb4621e728965db94c (patch) | |
| tree | ecaca2bab01ab4bb56f74975732a91e421cd86fc /drivers/input/serio | |
| parent | Input: xpad - use le16_to_cpup when parsing data stream (diff) | |
| download | linux-dev-018db6bb0d726c3683a5e1eb4621e728965db94c.tar.xz linux-dev-018db6bb0d726c3683a5e1eb4621e728965db94c.zip | |
Input: i8042 - restore control register when enabling port fails
When enabling interrupts for a port fails, the interrupt enable and
port enable bits remain set in i8042_ctr. Later writes of i8042_ctr
to the hardware could accidentally retry enabling interrupts. Clear
the bits on failure.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 3888dc307e0c..42aa4ec72661 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -385,6 +385,8 @@ static int i8042_enable_kbd_port(void) i8042_ctr |= I8042_CTR_KBDINT; if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) { + i8042_ctr &= ~I8042_CTR_KBDINT; + i8042_ctr |= I8042_CTR_KBDDIS; printk(KERN_ERR "i8042.c: Failed to enable KBD port.\n"); return -EIO; } @@ -402,6 +404,8 @@ static int i8042_enable_aux_port(void) i8042_ctr |= I8042_CTR_AUXINT; if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) { + i8042_ctr &= ~I8042_CTR_AUXINT; + i8042_ctr |= I8042_CTR_AUXDIS; printk(KERN_ERR "i8042.c: Failed to enable AUX port.\n"); return -EIO; } |