diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-31 01:31:07 -0500 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-31 01:31:07 -0500 |
commit | 97d4ebfe7946bc9b89791c932a15c990a24aa94d (patch) | |
tree | 4ee4dcabaae114c40f398182c1088bf7f8595d40 /drivers/input/joystick/iforce/iforce-packets.c | |
parent | 275c6ce25d679a4c0981a9a259e60e732a123cc6 (diff) |
Input: iforce - fix detection of USB devices
Recent conversion to wait_event_interruptible_timeout() caused
USB detection routine erroneously report timeouts for perfectly
working devices.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
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 4a2629243e19..76cb1f88f4e8 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, | |||
167 | iforce->expect_packet = 0; | 167 | iforce->expect_packet = 0; |
168 | iforce->ecmd = cmd; | 168 | iforce->ecmd = cmd; |
169 | memcpy(iforce->edata, data, IFORCE_MAX_LENGTH); | 169 | memcpy(iforce->edata, data, IFORCE_MAX_LENGTH); |
170 | wake_up(&iforce->wait); | ||
171 | } | 170 | } |
172 | #endif | 171 | #endif |
172 | wake_up(&iforce->wait); | ||
173 | 173 | ||
174 | if (!iforce->type) { | 174 | if (!iforce->type) { |
175 | being_used--; | 175 | being_used--; |
@@ -264,7 +264,7 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet) | |||
264 | wait_event_interruptible_timeout(iforce->wait, | 264 | wait_event_interruptible_timeout(iforce->wait, |
265 | iforce->ctrl->status != -EINPROGRESS, HZ); | 265 | iforce->ctrl->status != -EINPROGRESS, HZ); |
266 | 266 | ||
267 | if (iforce->ctrl->status != -EINPROGRESS) { | 267 | if (iforce->ctrl->status) { |
268 | usb_unlink_urb(iforce->ctrl); | 268 | usb_unlink_urb(iforce->ctrl); |
269 | return -1; | 269 | return -1; |
270 | } | 270 | } |