Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 57498
b: refs/heads/master
c: fd209e3
h: refs/heads/master
v: v3
  • Loading branch information
Simon Arlott authored and Greg Kroah-Hartman committed Jun 8, 2007
1 parent 2bfaf99 commit c67b8fa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 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: da1f82b5543738d4c127a449490bc0d55e121fe8
refs/heads/master: fd209e35b74110ee1f3371838b0782b5b02eaaba
7 changes: 1 addition & 6 deletions trunk/drivers/usb/atm/cxacru.c
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,6 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
add_timer(&timer);
wait_for_completion(done);
status = urb->status;
if (status == -ECONNRESET)
status = -ETIMEDOUT;
del_timer_sync(&timer);

if (actual_length)
Expand Down Expand Up @@ -671,11 +669,8 @@ static int cxacru_atm_start(struct usbatm_data *usbatm_instance,
/* start ADSL */
mutex_lock(&instance->adsl_state_serialize);
ret = cxacru_cm(instance, CM_REQUEST_CHIP_ADSL_LINE_START, NULL, 0, NULL, 0);
if (ret < 0) {
if (ret < 0)
atm_err(usbatm_instance, "cxacru_atm_start: CHIP_ADSL_LINE_START returned %d\n", ret);
mutex_unlock(&instance->adsl_state_serialize);
return ret;
}

/* Start status polling */
mutex_lock(&instance->poll_state_serialize);
Expand Down

0 comments on commit c67b8fa

Please sign in to comment.