summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2014-10-31 19:16:19 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-31 19:31:57 +0300
commitd0269b8475020718afd7f559064698f5500fa879 (patch)
treeccdaa76f5ac3cddcadcfd671350ae2fff2fa8dcf /drivers/input
parentfbefc5e7e63228d56963eeb0db10209ea0fafe9d (diff)
downloadlinux-d0269b8475020718afd7f559064698f5500fa879.tar.xz
Input: altera_ps2 - write to correct register when disabling interrupts
In altera_ps2_close, the data register (offset 0) is written instead of the control register (offset 4), leading to the RX interrupt not being disabled. Fix this by calling writel() with the offset for the proper register. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/altera_ps2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
index cce69d6b9587..e0371e182a2a 100644
--- a/drivers/input/serio/altera_ps2.c
+++ b/drivers/input/serio/altera_ps2.c
@@ -74,7 +74,7 @@ static void altera_ps2_close(struct serio *io)
{
struct ps2if *ps2if = io->port_data;
- writel(0, ps2if->base); /* disable rx irq */
+ writel(0, ps2if->base + 4); /* disable rx irq */
}
/*