projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arm-soc/for-3.18/cygnus-dts-v9' of http://github.com/brcm/linux into next/dt
[cascardo/linux.git]
/
drivers
/
input
/
serio
/
altera_ps2.c
diff --git
a/drivers/input/serio/altera_ps2.c
b/drivers/input/serio/altera_ps2.c
index
cce69d6
..
58781c8
100644
(file)
--- a/
drivers/input/serio/altera_ps2.c
+++ b/
drivers/input/serio/altera_ps2.c
@@
-37,7
+37,7
@@
static irqreturn_t altera_ps2_rxint(int irq, void *dev_id)
{
struct ps2if *ps2if = dev_id;
unsigned int status;
{
struct ps2if *ps2if = dev_id;
unsigned int status;
- i
n
t handled = IRQ_NONE;
+ i
rqreturn_
t handled = IRQ_NONE;
while ((status = readl(ps2if->base)) & 0xffff0000) {
serio_interrupt(ps2if->io, status & 0xff, 0);
while ((status = readl(ps2if->base)) & 0xffff0000) {
serio_interrupt(ps2if->io, status & 0xff, 0);
@@
-74,7
+74,7
@@
static void altera_ps2_close(struct serio *io)
{
struct ps2if *ps2if = io->port_data;
{
struct ps2if *ps2if = io->port_data;
- writel(0, ps2if->base); /* disable rx irq */
+ writel(0, ps2if->base
+ 4
); /* disable rx irq */
}
/*
}
/*