On Fri, Oct 31, 2014 at 01:41:29PM +0100, Tobias Klauser wrote:
> 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@xxxxxxxxxx>
Applied the first 2 and queued 3rd for 3.19. Thanks Tobias.
> ---
> drivers/input/serio/altera_ps2.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
> index cce69d6..e0371e1 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 */
> }
>
> /*
> --
> 2.0.1
>
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
