Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4919
b: refs/heads/master
c: 86cf42e
h: refs/heads/master
i:
  4917: a5cd33f
  4915: e6057a1
  4911: 4ced885
v: v3
  • Loading branch information
Duncan Sands authored and David S. Miller committed Jul 19, 2005
1 parent 6c91182 commit 555cf16
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 88e9fa8a54cf4d66ee8fc1d855e82de827233d74
refs/heads/master: 86cf42e4e029b83110cf98692420239103363dbf
12 changes: 6 additions & 6 deletions trunk/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, "ADSL line is down\n");
atm_info(usbatm, "%s\n", "ADSL line is down");
/* 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, "ADSL line is blocked?\n");
atm_info(usbatm, "%s\n", "ADSL line is blocked?");
break;

case 0x10:
atm_dev->signal = ATM_PHY_SIG_LOST;
atm_info(usbatm, "ADSL line is synchronising\n");
atm_info(usbatm, "%s\n", "ADSL line is synchronising");
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, "Too many failures - disabling line status polling\n");
atm_warn(instance->usbatm, "%s\n", "Too many failures - disabling line status polling");
}

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, "DSL line goes up\n");
atm_info(usbatm, "%s\n", "DSL line goes up");
} else if ((count == 6) && !memcmp(down_int, instance->int_data, 6)) {
atm_info(usbatm, "DSL line goes down\n");
atm_info(usbatm, "%s\n", "DSL line goes down");
} else {
int i;

Expand Down

0 comments on commit 555cf16

Please sign in to comment.