projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fbefc5e
)
Input: altera_ps2 - write to correct register when disabling interrupts
author
Tobias Klauser
<tklauser@distanz.ch>
Fri, 31 Oct 2014 16:16:19 +0000
(09:16 -0700)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Fri, 31 Oct 2014 16:31:57 +0000
(09:31 -0700)
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>
drivers/input/serio/altera_ps2.c
patch
|
blob
|
history
diff --git
a/drivers/input/serio/altera_ps2.c
b/drivers/input/serio/altera_ps2.c
index cce69d6b95871107e9540363a15256f360ef8723..e0371e182a2afd42a32212da3a8812e31c6dca04 100644
(file)
--- 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 */
}
/*