From: Tobias Klauser Date: Fri, 31 Oct 2014 16:16:19 +0000 (-0700) Subject: Input: altera_ps2 - write to correct register when disabling interrupts X-Git-Tag: v3.18-rc3~11^2~2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d0269b8475020718afd7f559064698f5500fa879;p=~emulex%2Finfiniband.git 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 Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c index cce69d6b958..e0371e182a2 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 */ } /*