diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:29:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:29:23 -0400 |
| commit | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (patch) | |
| tree | 9116e5bde860d00685c5b6eee7be5ba9899aabb9 /drivers/net/wan/cosa.c | |
| parent | 972c26bdd6b58e7534473c4f7928584578cf43f4 (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/wan/cosa.c')
| -rw-r--r-- | drivers/net/wan/cosa.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 7ff814fd65d0..ae9e897c255e 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c | |||
| @@ -1617,8 +1617,7 @@ static int get_wait_data(struct cosa_data *cosa) | |||
| 1617 | return r; | 1617 | return r; |
| 1618 | } | 1618 | } |
| 1619 | /* sleep if not ready to read */ | 1619 | /* sleep if not ready to read */ |
| 1620 | set_current_state(TASK_INTERRUPTIBLE); | 1620 | schedule_timeout_interruptible(1); |
| 1621 | schedule_timeout(1); | ||
| 1622 | } | 1621 | } |
| 1623 | printk(KERN_INFO "cosa: timeout in get_wait_data (status 0x%x)\n", | 1622 | printk(KERN_INFO "cosa: timeout in get_wait_data (status 0x%x)\n", |
| 1624 | cosa_getstatus(cosa)); | 1623 | cosa_getstatus(cosa)); |
| @@ -1644,8 +1643,7 @@ static int put_wait_data(struct cosa_data *cosa, int data) | |||
| 1644 | } | 1643 | } |
| 1645 | #if 0 | 1644 | #if 0 |
| 1646 | /* sleep if not ready to read */ | 1645 | /* sleep if not ready to read */ |
| 1647 | current->state = TASK_INTERRUPTIBLE; | 1646 | schedule_timeout_interruptible(1); |
| 1648 | schedule_timeout(1); | ||
| 1649 | #endif | 1647 | #endif |
| 1650 | } | 1648 | } |
| 1651 | printk(KERN_INFO "cosa%d: timeout in put_wait_data (status 0x%x)\n", | 1649 | printk(KERN_INFO "cosa%d: timeout in put_wait_data (status 0x%x)\n", |