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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
char
/
pty.c
diff --git
a/drivers/char/pty.c
b/drivers/char/pty.c
index
4cea8c0
..
fcbb325
100644
(file)
--- a/
drivers/char/pty.c
+++ b/
drivers/char/pty.c
@@
-144,14
+144,14
@@
static int pty_write(struct tty_struct * tty, int from_user,
buf += n;
c += n;
count -= n;
buf += n;
c += n;
count -= n;
- to->ldisc.receive_buf(to, temp_buffer,
0
, n);
+ to->ldisc.receive_buf(to, temp_buffer,
NULL
, n);
}
up(&tty->flip.pty_sem);
} else {
c = to->ldisc.receive_room(to);
if (c > count)
c = count;
}
up(&tty->flip.pty_sem);
} else {
c = to->ldisc.receive_room(to);
if (c > count)
c = count;
- to->ldisc.receive_buf(to, buf,
0
, c);
+ to->ldisc.receive_buf(to, buf,
NULL
, c);
}
return c;
}
return c;