lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Input: iforce - use wait_event_interruptible_timeout

Browse Source 
The timeout while() loops in iforce-packets.c lack a
set_current_state(TASK_INTERRUPTIBLE); call. The right solution is
to replace them with wait_event_interruptible_timeout().

Reported-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Vojtech Pavlik
2005-09-05 00:12:39 -05:00
committed by Dmitry Torokhov
parent 39fd748f56
commit fb76b099f8
2 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/input/joystick/iforce/iforce-packets.c
View File

@@ -249,9 +249,6 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data,
int iforce_get_id_packet(struct iforce *iforce, char *packet) int iforce_get_id_packet(struct iforce *iforce, char *packet)
{ {
DECLARE_WAITQUEUE(wait, current);
int timeout = HZ; /* 1 second */
switch (iforce->bus) { switch (iforce->bus) {
case IFORCE_USB: case IFORCE_USB:
@@ -260,22 +257,13 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
iforce->cr.bRequest = packet[0]; iforce->cr.bRequest = packet[0];
iforce->ctrl->dev = iforce->usbdev; iforce->ctrl->dev = iforce->usbdev;
set_current_state(TASK_INTERRUPTIBLE); if (usb_submit_urb(iforce->ctrl, GFP_ATOMIC))
add_wait_queue(&iforce->wait, &wait);
if (usb_submit_urb(iforce->ctrl, GFP_ATOMIC)) {
set_current_state(TASK_RUNNING);
remove_wait_queue(&iforce->wait, &wait);
return -1; return -1;
}
while (timeout && iforce->ctrl->status == -EINPROGRESS) wait_event_interruptible_timeout(iforce->wait,
timeout = schedule_timeout(timeout); iforce->ctrl->status != -EINPROGRESS, HZ);
set_current_state(TASK_RUNNING); if (iforce->ctrl->status != -EINPROGRESS) {
remove_wait_queue(&iforce->wait, &wait);
if (!timeout) {
usb_unlink_urb(iforce->ctrl); usb_unlink_urb(iforce->ctrl);
return -1; return -1;
} }
@@ -290,16 +278,10 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
iforce->expect_packet = FF_CMD_QUERY; iforce->expect_packet = FF_CMD_QUERY;
iforce_send_packet(iforce, FF_CMD_QUERY, packet); iforce_send_packet(iforce, FF_CMD_QUERY, packet);
set_current_state(TASK_INTERRUPTIBLE); wait_event_interruptible_timeout(iforce->wait,
add_wait_queue(&iforce->wait, &wait); !iforce->expect_packet, HZ);
while (timeout && iforce->expect_packet) if (iforce->expect_packet) {
timeout = schedule_timeout(timeout);
set_current_state(TASK_RUNNING);
remove_wait_queue(&iforce->wait, &wait);
if (!timeout) {
iforce->expect_packet = 0; iforce->expect_packet = 0;
return -1; return -1;
} }

1
drivers/input/joystick/iforce/iforce-usb.c
View File

@@ -95,6 +95,7 @@ static void iforce_usb_irq(struct urb *urb, struct pt_regs *regs)
goto exit; goto exit;
} }
wake_up(&iforce->wait);
iforce_process_packet(iforce, iforce_process_packet(iforce,
(iforce->data[0] << 8) | (urb->actual_length - 1), iforce->data + 1, regs); (iforce->data[0] << 8) | (urb->actual_length - 1), iforce->data + 1, regs);