projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree
[powerpc.git]
/
drivers
/
input
/
mouse
/
alps.c
diff --git
a/drivers/input/mouse/alps.c
b/drivers/input/mouse/alps.c
index
2141501
..
070d753
100644
(file)
--- a/
drivers/input/mouse/alps.c
+++ b/
drivers/input/mouse/alps.c
@@
-100,8
+100,8
@@
static void alps_process_packet(struct psmouse *psmouse, struct pt_regs *regs)
}
if (priv->i->flags & ALPS_OLDPROTO) {
}
if (priv->i->flags & ALPS_OLDPROTO) {
- left = packet[2] & 0x
08
;
- right = packet[2] & 0x
10
;
+ left = packet[2] & 0x
10
;
+ right = packet[2] & 0x
08
;
middle = 0;
x = packet[1] | ((packet[0] & 0x07) << 7);
y = packet[4] | ((packet[3] & 0x07) << 7);
middle = 0;
x = packet[1] | ((packet[0] & 0x07) << 7);
y = packet[4] | ((packet[3] & 0x07) << 7);
@@
-470,7
+470,7
@@
int alps_init(struct psmouse *psmouse)
dev1->keybit[LONG(BTN_BACK)] |= BIT(BTN_BACK);
}
dev1->keybit[LONG(BTN_BACK)] |= BIT(BTN_BACK);
}
- s
printf(priv->phys
, "%s/input1", psmouse->ps2dev.serio->phys);
+ s
nprintf(priv->phys, sizeof(priv->phys)
, "%s/input1", psmouse->ps2dev.serio->phys);
dev2->phys = priv->phys;
dev2->name = (priv->i->flags & ALPS_DUALPOINT) ? "DualPoint Stick" : "PS/2 Mouse";
dev2->id.bustype = BUS_I8042;
dev2->phys = priv->phys;
dev2->name = (priv->i->flags & ALPS_DUALPOINT) ? "DualPoint Stick" : "PS/2 Mouse";
dev2->id.bustype = BUS_I8042;