From fc7d403ef99461890948a81d5736f9db83d46d41 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 18 Jul 2007 10:58:02 -0700 Subject: [PATCH] --- yaml --- r: 61942 b: refs/heads/master c: c35f68a05d0916e89ae2aab1a456f96fea9190cd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/atm/cxacru.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6802794d3cc7..fb0a892062e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 598f22e11bef8171f2244128bf0341da38fe8a23 +refs/heads/master: c35f68a05d0916e89ae2aab1a456f96fea9190cd diff --git a/trunk/drivers/usb/atm/cxacru.c b/trunk/drivers/usb/atm/cxacru.c index 1bc884051e0f..02c52f8d5dbf 100644 --- a/trunk/drivers/usb/atm/cxacru.c +++ b/trunk/drivers/usb/atm/cxacru.c @@ -456,7 +456,7 @@ 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); @@ -464,7 +464,6 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done, timer.function = cxacru_timeout_kill; add_timer(&timer); wait_for_completion(done); - status = urb->status; del_timer_sync(&timer); if (actual_length)