* [PATCH 1/3] Input: altera_ps2 - write to correct register when disabling interrupts
@ 2014-10-31 12:41 Tobias Klauser
2014-10-31 16:52 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Tobias Klauser @ 2014-10-31 12:41 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-input
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>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/3] Input: altera_ps2 - write to correct register when disabling interrupts
2014-10-31 12:41 [PATCH 1/3] Input: altera_ps2 - write to correct register when disabling interrupts Tobias Klauser
@ 2014-10-31 16:52 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2014-10-31 16:52 UTC (permalink / raw)
To: Tobias Klauser; +Cc: linux-input
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@distanz.ch>
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-31 16:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-31 12:41 [PATCH 1/3] Input: altera_ps2 - write to correct register when disabling interrupts Tobias Klauser
2014-10-31 16:52 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).