Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 06:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ATM]: speedtch: Revert 86cf42e4e0

Browse Source 
It was already fixed more sufficiently by Andrew Morton's
change 843c944fb8.

Noted by Duncan Sands.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2005-07-25 19:54:35 -07:00
parent fc87670b6c
commit 52fbae2a39
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/atm/speedtch.c
View File

@ -448,19 +448,19 @@ static void speedtch_check_status(struct speedtch_instance_data *instance)
case 0: case 0:
atm_dev->signal = ATM_PHY_SIG_LOST; atm_dev->signal = ATM_PHY_SIG_LOST;
if (instance->last_status) if (instance->last_status)
atm_info(usbatm, "%s\n", "ADSL line is down"); atm_info(usbatm, "ADSL line is down\n");
/* It may never resync again unless we ask it to... */ /* It may never resync again unless we ask it to... */
ret = speedtch_start_synchro(instance); ret = speedtch_start_synchro(instance);
break; break;
case 0x08: case 0x08:
atm_dev->signal = ATM_PHY_SIG_UNKNOWN; atm_dev->signal = ATM_PHY_SIG_UNKNOWN;
atm_info(usbatm, "%s\n", "ADSL line is blocked?"); atm_info(usbatm, "ADSL line is blocked?\n");
break; break;
case 0x10: case 0x10:
atm_dev->signal = ATM_PHY_SIG_LOST; atm_dev->signal = ATM_PHY_SIG_LOST;
atm_info(usbatm, "%s\n", "ADSL line is synchronising"); atm_info(usbatm, "ADSL line is synchronising\n");
break; break;
case 0x20: case 0x20:
@ -502,7 +502,7 @@ static void speedtch_status_poll(unsigned long data)
if (instance->poll_delay < MAX_POLL_DELAY) if (instance->poll_delay < MAX_POLL_DELAY)
mod_timer(&instance->status_checker.timer, jiffies + msecs_to_jiffies(instance->poll_delay)); mod_timer(&instance->status_checker.timer, jiffies + msecs_to_jiffies(instance->poll_delay));
else else
atm_warn(instance->usbatm, "%s\n", "Too many failures - disabling line status polling"); atm_warn(instance->usbatm, "Too many failures - disabling line status polling\n");
} }
static void speedtch_resubmit_int(unsigned long data) static void speedtch_resubmit_int(unsigned long data)
@ -545,9 +545,9 @@ static void speedtch_handle_int(struct urb *int_urb, struct pt_regs *regs)
if ((count == 6) && !memcmp(up_int, instance->int_data, 6)) { if ((count == 6) && !memcmp(up_int, instance->int_data, 6)) {
del_timer(&instance->status_checker.timer); del_timer(&instance->status_checker.timer);
atm_info(usbatm, "%s\n", "DSL line goes up"); atm_info(usbatm, "DSL line goes up\n");
} else if ((count == 6) && !memcmp(down_int, instance->int_data, 6)) { } else if ((count == 6) && !memcmp(down_int, instance->int_data, 6)) {
atm_info(usbatm, "%s\n", "DSL line goes down"); atm_info(usbatm, "DSL line goes down\n");
} else { } else {
int i; int i;