aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/atm/cxacru.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index 68cf582fd4fa..8bcf7fe1dd80 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -476,8 +476,6 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
476 add_timer(&timer); 476 add_timer(&timer);
477 wait_for_completion(done); 477 wait_for_completion(done);
478 status = urb->status; 478 status = urb->status;
479 if (status == -ECONNRESET)
480 status = -ETIMEDOUT;
481 del_timer_sync(&timer); 479 del_timer_sync(&timer);
482 480
483 if (actual_length) 481 if (actual_length)
@@ -671,11 +669,8 @@ static int cxacru_atm_start(struct usbatm_data *usbatm_instance,
671 /* start ADSL */ 669 /* start ADSL */
672 mutex_lock(&instance->adsl_state_serialize); 670 mutex_lock(&instance->adsl_state_serialize);
673 ret = cxacru_cm(instance, CM_REQUEST_CHIP_ADSL_LINE_START, NULL, 0, NULL, 0); 671 ret = cxacru_cm(instance, CM_REQUEST_CHIP_ADSL_LINE_START, NULL, 0, NULL, 0);
674 if (ret < 0) { 672 if (ret < 0)
675 atm_err(usbatm_instance, "cxacru_atm_start: CHIP_ADSL_LINE_START returned %d\n", ret); 673 atm_err(usbatm_instance, "cxacru_atm_start: CHIP_ADSL_LINE_START returned %d\n", ret);
676 mutex_unlock(&instance->adsl_state_serialize);
677 return ret;
678 }
679 674
680 /* Start status polling */ 675 /* Start status polling */
681 mutex_lock(&instance->poll_state_serialize); 676 mutex_lock(&instance->poll_state_serialize);