From c67b8faa333dc1b0c053d73002f69c22e7f12a51 Mon Sep 17 00:00:00 2001 From: Simon Arlott Date: Thu, 10 May 2007 23:04:13 -0700 Subject: [PATCH] --- yaml --- r: 57498 b: refs/heads/master c: fd209e35b74110ee1f3371838b0782b5b02eaaba h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/atm/cxacru.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a83706209ddc..7af727a1160c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da1f82b5543738d4c127a449490bc0d55e121fe8 +refs/heads/master: fd209e35b74110ee1f3371838b0782b5b02eaaba diff --git a/trunk/drivers/usb/atm/cxacru.c b/trunk/drivers/usb/atm/cxacru.c index 68cf582fd4fa..8bcf7fe1dd80 100644 --- a/trunk/drivers/usb/atm/cxacru.c +++ b/trunk/drivers/usb/atm/cxacru.c @@ -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) @@ -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);