Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 64307
b: refs/heads/master
c: 3b79cc2
h: refs/heads/master
i:
  64305: 1a808c4
  64303: 9bf477b
v: v3
  • Loading branch information
Oliver Neukum authored and Greg Kroah-Hartman committed Aug 22, 2007
1 parent 493f396 commit 101ea3d
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: 04cab1329336d4577d6638360c905e360934b425
refs/heads/master: 3b79cc26708bcc476d4e4bf3846032fa3a1eeb85
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,7 +456,6 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
int* actual_length)
{
struct timer_list timer;
int status = urb->status;

init_timer(&timer);
timer.expires = jiffies + msecs_to_jiffies(CMD_TIMEOUT);
Expand All @@ -468,7 +467,7 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,

if (actual_length)
*actual_length = urb->actual_length;
return status;
return urb->status; /* must read status after completion */
}

static int cxacru_cm(struct cxacru_data *instance, enum cxacru_cm_request cm,
Expand Down

0 comments on commit 101ea3d

Please sign in to comment.