diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2014-10-31 09:16:19 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-11-19 23:15:22 +0100 |
| commit | 937d4c93ad018deb95c363ed469ed3b228e6e24e (patch) | |
| tree | 6b33607f3c70b9bf17d55b541225a1401f7f1629 | |
| parent | 214c97a12f1f14260b90eea07444de6aa3b90d27 (diff) | |
| download | lwn-937d4c93ad018deb95c363ed469ed3b228e6e24e.tar.gz lwn-937d4c93ad018deb95c363ed469ed3b228e6e24e.zip | |
Input: altera_ps2 - write to correct register when disabling interrupts
commit d0269b8475020718afd7f559064698f5500fa879 upstream.
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/input/serio/altera_ps2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c index 4777a73cd390..b6d370ba408f 100644 --- a/drivers/input/serio/altera_ps2.c +++ b/drivers/input/serio/altera_ps2.c @@ -75,7 +75,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 */ } /* |