diff options
| author | David S. Miller <davem@davemloft.net> | 2005-07-25 22:54:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-07-25 22:54:35 -0400 |
| commit | 52fbae2a392b6e084195bedc7a280991a94c14d0 (patch) | |
| tree | 10778d2286e381980fd7d7898a654aea13b377c4 | |
| parent | fc87670b6cd63abc6fc4e3a115741984750d1fbc (diff) | |
[ATM]: speedtch: Revert 86cf42e4e029b83110cf98692420239103363dbf
It was already fixed more sufficiently by Andrew Morton's
change 843c944fb86e5e31ee7b319172e657ea22301322.
Noted by Duncan Sands.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/usb/atm/speedtch.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c index 6bd581e69afd..d0cbbb7f0385 100644 --- a/drivers/usb/atm/speedtch.c +++ b/drivers/usb/atm/speedtch.c | |||
| @@ -448,19 +448,19 @@ static void speedtch_check_status(struct speedtch_instance_data *instance) | |||
| 448 | case 0: | 448 | case 0: |
| 449 | atm_dev->signal = ATM_PHY_SIG_LOST; | 449 | atm_dev->signal = ATM_PHY_SIG_LOST; |
| 450 | if (instance->last_status) | 450 | if (instance->last_status) |
| 451 | atm_info(usbatm, "%s\n", "ADSL line is down"); | 451 | atm_info(usbatm, "ADSL line is down\n"); |
| 452 | /* It may never resync again unless we ask it to... */ | 452 | /* It may never resync again unless we ask it to... */ |
| 453 | ret = speedtch_start_synchro(instance); | 453 | ret = speedtch_start_synchro(instance); |
| 454 | break; | 454 | break; |
| 455 | 455 | ||
| 456 | case 0x08: | 456 | case 0x08: |
| 457 | atm_dev->signal = ATM_PHY_SIG_UNKNOWN; | 457 | atm_dev->signal = ATM_PHY_SIG_UNKNOWN; |
| 458 | atm_info(usbatm, "%s\n", "ADSL line is blocked?"); | 458 | atm_info(usbatm, "ADSL line is blocked?\n"); |
| 459 | break; | 459 | break; |
| 460 | 460 | ||
| 461 | case 0x10: | 461 | case 0x10: |
| 462 | atm_dev->signal = ATM_PHY_SIG_LOST; | 462 | atm_dev->signal = ATM_PHY_SIG_LOST; |
| 463 | atm_info(usbatm, "%s\n", "ADSL line is synchronising"); | 463 | atm_info(usbatm, "ADSL line is synchronising\n"); |
| 464 | break; | 464 | break; |
| 465 | 465 | ||
| 466 | case 0x20: | 466 | case 0x20: |
| @@ -502,7 +502,7 @@ static void speedtch_status_poll(unsigned long data) | |||
| 502 | if (instance->poll_delay < MAX_POLL_DELAY) | 502 | if (instance->poll_delay < MAX_POLL_DELAY) |
| 503 | mod_timer(&instance->status_checker.timer, jiffies + msecs_to_jiffies(instance->poll_delay)); | 503 | mod_timer(&instance->status_checker.timer, jiffies + msecs_to_jiffies(instance->poll_delay)); |
| 504 | else | 504 | else |
| 505 | atm_warn(instance->usbatm, "%s\n", "Too many failures - disabling line status polling"); | 505 | atm_warn(instance->usbatm, "Too many failures - disabling line status polling\n"); |
| 506 | } | 506 | } |
| 507 | 507 | ||
| 508 | static void speedtch_resubmit_int(unsigned long data) | 508 | 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) | |||
| 545 | 545 | ||
| 546 | if ((count == 6) && !memcmp(up_int, instance->int_data, 6)) { | 546 | if ((count == 6) && !memcmp(up_int, instance->int_data, 6)) { |
| 547 | del_timer(&instance->status_checker.timer); | 547 | del_timer(&instance->status_checker.timer); |
| 548 | atm_info(usbatm, "%s\n", "DSL line goes up"); | 548 | atm_info(usbatm, "DSL line goes up\n"); |
| 549 | } else if ((count == 6) && !memcmp(down_int, instance->int_data, 6)) { | 549 | } else if ((count == 6) && !memcmp(down_int, instance->int_data, 6)) { |
| 550 | atm_info(usbatm, "%s\n", "DSL line goes down"); | 550 | atm_info(usbatm, "DSL line goes down\n"); |
| 551 | } else { | 551 | } else { |
| 552 | int i; | 552 | int i; |
| 553 | 553 | ||
