Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 61942
b: refs/heads/master
c: c35f68a
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jul 20, 2007
1 parent f5c3efe commit fc7d403
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 598f22e11bef8171f2244128bf0341da38fe8a23
refs/heads/master: c35f68a05d0916e89ae2aab1a456f96fea9190cd
3 changes: 1 addition & 2 deletions trunk/drivers/usb/atm/cxacru.c
Original file line number Diff line number Diff line change
Expand Up @@ -456,15 +456,14 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
int* actual_length)
{
struct timer_list timer;
int status;
int status = urb->status;

init_timer(&timer);
timer.expires = jiffies + msecs_to_jiffies(CMD_TIMEOUT);
timer.data = (unsigned long) urb;
timer.function = cxacru_timeout_kill;
add_timer(&timer);
wait_for_completion(done);
status = urb->status;
del_timer_sync(&timer);

if (actual_length)
Expand Down

0 comments on commit fc7d403

Please sign in to comment.