Skip to contentSkip to conversation

cxacru: Ignore error trying to start ADSL in atm_start

PATCH In review Simon Arlott 1 participant 1 message May 4, 2007

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 cxacru: Ignore error trying to start ADSL in atm_start

The sysfs adsl_status attribute ignores (aside from returning -EIO to the user) any error sending a START/STOP command to the device and there is at least one firmware which never sends a response but appears to work regardless. Therefore atm_start should also continue if an error is received so that such firmware is usable.

The official Conexant driver doesn't expect a reply either but this is for another device (E2 router) and a commonly used firmware does respond.

Also, there is no point in changing -ECONNRESET to -ETIMEDOUT since nothing ever checks for either of these values.

---
drivers/usb/atm/cxacru.c | 7 +------

1 files changed, 1 insertions(+), 6 deletions(-)
drivers/usb/atm/cxacru.c +0 -0
index 4ecb4c7..32f85a6 100644
@@ -465,8 +465,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)
@@ -660,11 +658,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);
Signature · 4 lines
1.5.0.1

-- 
Simon Arlott