Input: altera_ps2 - write to correct register when disabling interrupts
authorTobias Klauser <tklauser@distanz.ch>
Fri, 31 Oct 2014 16:16:19 +0000 (09:16 -0700)
committerJiri Slaby <jslaby@suse.cz>
Wed, 19 Nov 2014 22:15:22 +0000 (23:15 +0100)
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>
drivers/input/serio/altera_ps2.c

index 4777a73cd39024022307a90868cf65fc43490caf..b6d370ba408f076bed86dcae72ffc25a9e586db3 100644 (file)
@@ -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 */
 }
 
 /*