diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 17:47:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 17:47:31 -0400 |
| commit | 3e0777b8fa96f7073ed5d13d3bc1d573b766bef9 (patch) | |
| tree | 3849e8457dd8f038ab7da025c708e275b43ea9c1 /drivers/input/joystick/grip_mp.c | |
| parent | a94130e00038ebeb2f66901a4a4a9e05a03051c1 (diff) | |
| parent | e5119885f00874453e837e3407014b73de2f4741 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually
Some manual fixups required due to clashes with the PF_FREEZE cleanups.
Diffstat (limited to 'drivers/input/joystick/grip_mp.c')
| -rw-r--r-- | drivers/input/joystick/grip_mp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c index 42e5005d621f..0da7bd133ccf 100644 --- a/drivers/input/joystick/grip_mp.c +++ b/drivers/input/joystick/grip_mp.c | |||
| @@ -171,7 +171,7 @@ static int mp_io(struct gameport* gameport, int sendflags, int sendcode, u32 *pa | |||
| 171 | *packet = 0; | 171 | *packet = 0; |
| 172 | raw_data = gameport_read(gameport); | 172 | raw_data = gameport_read(gameport); |
| 173 | if (raw_data & 1) | 173 | if (raw_data & 1) |
| 174 | return IO_RETRY; | 174 | return IO_RETRY; |
| 175 | 175 | ||
| 176 | for (i = 0; i < 64; i++) { | 176 | for (i = 0; i < 64; i++) { |
| 177 | raw_data = gameport_read(gameport); | 177 | raw_data = gameport_read(gameport); |