diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-18 00:53:14 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-18 00:53:14 +0200 |
| commit | 325a479c4c110db278ef3361460a48c4093252cc (patch) | |
| tree | bcfbf4d0647d9442045639a5c19da59d55190e81 /drivers/input | |
| parent | [IA64] Merge audit fix for fsyscalls with syscall-optimizations (diff) | |
| parent | [IA64] Fix convert_to_non_syscall() so gdb inferior calls work again (diff) | |
| download | linux-325a479c4c110db278ef3361460a48c4093252cc.tar.xz linux-325a479c4c110db278ef3361460a48c4093252cc.zip | |
Merge with temp tree to get David's gdb inferior calls patch
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/joystick/spaceorb.c | 2 | ||||
| -rw-r--r-- | drivers/input/keyboard/atkbd.c | 2 |
2 files changed, 2 insertions, 2 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; diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index f7304f0ce542..ff66ed4ee2cd 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c @@ -678,7 +678,7 @@ static void atkbd_disconnect(struct serio *serio) atkbd_disable(atkbd); /* make sure we don't have a command in flight */ - synchronize_kernel(); + synchronize_sched(); /* Allow atkbd_interrupt()s to complete. */ flush_scheduled_work(); device_remove_file(&serio->dev, &atkbd_attr_extra); |