projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[cascardo/linux.git]
/
drivers
/
net
/
tokenring
/
tms380tr.c
diff --git
a/drivers/net/tokenring/tms380tr.c
b/drivers/net/tokenring/tms380tr.c
index
2e39bf1
..
c192559
100644
(file)
--- a/
drivers/net/tokenring/tms380tr.c
+++ b/
drivers/net/tokenring/tms380tr.c
@@
-1243,8
+1243,7
@@
void tms380tr_wait(unsigned long time)
tmp = jiffies + time/(1000000/HZ);
do {
- current->state = TASK_INTERRUPTIBLE;
- tmp = schedule_timeout(tmp);
+ tmp = schedule_timeout_interruptible(tmp);
} while(time_after(tmp, jiffies));
#else
udelay(time);