diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2006-02-01 13:08:56 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-02-01 13:08:56 +0100 |
| commit | 847b9d01474f710e7a018186917d05e59e258309 (patch) | |
| tree | c0da8777ce350c4b048aa6ed2c41fdd109c42e92 /drivers/input/joystick/iforce/iforce-packets.c | |
| parent | d1d051b28e9d3c3bed0bd15a2b49df3d04f7768f (diff) | |
| parent | a6df590dd8b7644c8e298e3b13442bcd6ceeb739 (diff) | |
| download | op-kernel-dev-847b9d01474f710e7a018186917d05e59e258309.zip op-kernel-dev-847b9d01474f710e7a018186917d05e59e258309.tar.gz | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/input/joystick/iforce/iforce-packets.c')
| -rw-r--r-- | drivers/input/joystick/iforce/iforce-packets.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c index 4a26292..76cb1f8 100644 --- a/drivers/input/joystick/iforce/iforce-packets.c +++ b/drivers/input/joystick/iforce/iforce-packets.c @@ -167,9 +167,9 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data, iforce->expect_packet = 0; iforce->ecmd = cmd; memcpy(iforce->edata, data, IFORCE_MAX_LENGTH); - wake_up(&iforce->wait); } #endif + wake_up(&iforce->wait); if (!iforce->type) { being_used--; @@ -264,7 +264,7 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet) wait_event_interruptible_timeout(iforce->wait, iforce->ctrl->status != -EINPROGRESS, HZ); - if (iforce->ctrl->status != -EINPROGRESS) { + if (iforce->ctrl->status) { usb_unlink_urb(iforce->ctrl); return -1; } |
