Skip to content

Commit

Permalink
[ATM]: speedtch: Revert 86cf42e
Browse files Browse the repository at this point in the history
It was already fixed more sufficiently by Andrew Morton's
change 843c944.

Noted by Duncan Sands.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jul 26, 2005
1 parent fc87670 commit 52fbae2
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/usb/atm/speedtch.c
Original file line number Diff line number Diff line change
Expand Up @@ -448,19 +448,19 @@ static void speedtch_check_status(struct speedtch_instance_data *instance)
case 0:
atm_dev->signal = ATM_PHY_SIG_LOST;
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... */
ret = speedtch_start_synchro(instance);
break;

case 0x08:
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;

case 0x10:
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;

case 0x20:
Expand Down Expand Up @@ -502,7 +502,7 @@ static void speedtch_status_poll(unsigned long data)
if (instance->poll_delay < MAX_POLL_DELAY)
mod_timer(&instance->status_checker.timer, jiffies + msecs_to_jiffies(instance->poll_delay));
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)
Expand Down Expand Up @@ -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)) {
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)) {
atm_info(usbatm, "%s\n", "DSL line goes down");
atm_info(usbatm, "DSL line goes down\n");
} else {
int i;

Expand Down

0 comments on commit 52fbae2

Please sign in to comment.