Use wait_event_timeout() instead of custom wait-queue code. The current code uses TASK_INTERRUPTIBLE but doesn't seem to care about signals so TASK_UNINTERRUPTIBLE should be ok. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer --- kj-domen/drivers/usb/input/ati_remote.c | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff -puN drivers/usb/input/ati_remote.c~wait_event_timeout-drivers_usb_input_ati_remote drivers/usb/input/ati_remote.c --- kj/drivers/usb/input/ati_remote.c~wait_event_timeout-drivers_usb_input_ati_remote 2005-03-02 10:43:48.000000000 +0100 +++ kj-domen/drivers/usb/input/ati_remote.c 2005-03-02 10:43:48.000000000 +0100 @@ -94,6 +94,7 @@ #include #include #include +#include /* * Module and Version Information, Module Parameters @@ -396,8 +397,6 @@ static void ati_remote_irq_out(struct ur */ static int ati_remote_sendpacket(struct ati_remote *ati_remote, u16 cmd, unsigned char *data) { - DECLARE_WAITQUEUE(wait, current); - int timeout = HZ; /* 1 second */ int retval = 0; /* Set up out_urb */ @@ -415,18 +414,10 @@ static int ati_remote_sendpacket(struct return retval; } - set_current_state(TASK_INTERRUPTIBLE); - add_wait_queue(&ati_remote->wait, &wait); - - while (timeout && (ati_remote->out_urb->status == -EINPROGRESS) - && !(ati_remote->send_flags & SEND_FLAG_COMPLETE)) { - set_current_state(TASK_INTERRUPTIBLE); - timeout = schedule_timeout(timeout); - rmb(); - } - - set_current_state(TASK_RUNNING); - remove_wait_queue(&ati_remote->wait, &wait); + wait_event_timeout(ati_remote->wait, + ((ati_remote->out_urb->status != -EINPROGRESS) || + (ati_remote->send_flags & SEND_FLAG_COMPLETE)), + HZ); usb_kill_urb(ati_remote->out_urb); return retval; _