aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/spaceorb.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-05-03 08:14:09 +0100
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-05-03 08:14:09 +0100
commit27b030d58c8e72fc7a95187a791bd9406e350f02 (patch)
treeab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /drivers/input/joystick/spaceorb.c
parent[AUDIT] Update UML audit-syscall-{entry,exit} calls to new prototypes (diff)
parent[PATCH] JFS: Don't allocate extents that overlap existing extents (diff)
downloadlinux-dev-27b030d58c8e72fc7a95187a791bd9406e350f02.tar.xz
linux-dev-27b030d58c8e72fc7a95187a791bd9406e350f02.zip
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to '')
-rw-r--r--drivers/input/joystick/spaceorb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c
index c76cf8ff29c0..874367bfab08 100644
--- a/drivers/input/joystick/spaceorb.c
+++ b/drivers/input/joystick/spaceorb.c
@@ -116,7 +116,7 @@ static void spaceorb_process_packet(struct spaceorb *spaceorb, struct pt_regs *r
case 'K': /* Button data */
if (spaceorb->idx != 5) return;
- for (i = 0; i < 7; i++)
+ for (i = 0; i < 6; i++)
input_report_key(dev, spaceorb_buttons[i], (data[2] >> i) & 1);
break;