git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
char
/
ip2
/
i2lib.c
diff --git
a/drivers/char/ip2/i2lib.c
b/drivers/char/ip2/i2lib.c
index
a886e95
..
fc944d3
100644
(file)
--- a/
drivers/char/ip2/i2lib.c
+++ b/
drivers/char/ip2/i2lib.c
@@
-141,7
+141,7
@@
fatality(i2eBordStrPtr pB )
//* Code *
//********
//* Code *
//********
-inline int
+
static
inline int
i2Validate ( i2ChanStrPtr pCh )
{
//ip2trace(pCh->port_index, ITRC_VERIFY,ITRC_ENTER,2,pCh->validity,
i2Validate ( i2ChanStrPtr pCh )
{
//ip2trace(pCh->port_index, ITRC_VERIFY,ITRC_ENTER,2,pCh->validity,
@@
-655,8
+655,7
@@
i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands,
timeout--; // So negative values == forever
if (!in_interrupt()) {
timeout--; // So negative values == forever
if (!in_interrupt()) {
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(1); // short nap
+ schedule_timeout_interruptible(1); // short nap
} else {
// we cannot sched/sleep in interrrupt silly
return 0;
} else {
// we cannot sched/sleep in interrrupt silly
return 0;
@@
-855,7
+854,7
@@
i2Input(i2ChanStrPtr pCh)
count += IBUF_SIZE;
}
// Don't give more than can be taken by the line discipline
count += IBUF_SIZE;
}
// Don't give more than can be taken by the line discipline
- amountToMove = pCh->pTTY->
ldisc.receive_room( pCh->pTTY )
;
+ amountToMove = pCh->pTTY->
receive_room
;
if (count > amountToMove) {
count = amountToMove;
}
if (count > amountToMove) {
count = amountToMove;
}
@@
-1132,8
+1131,7
@@
i2Output(i2ChanStrPtr pCh, const char *pSource, int count, int user )
ip2trace (CHANN, ITRC_OUTPUT, 61, 0 );
ip2trace (CHANN, ITRC_OUTPUT, 61, 0 );
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(2);
+ schedule_timeout_interruptible(2);
if (signal_pending(current)) {
break;
}
if (signal_pending(current)) {
break;
}