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]
/
arch
/
um
/
drivers
/
pty.c
diff --git
a/arch/um/drivers/pty.c
b/arch/um/drivers/pty.c
index
ed84d01
..
1c555c3
100644
(file)
--- a/
arch/um/drivers/pty.c
+++ b/
arch/um/drivers/pty.c
@@
-43,8
+43,9
@@
static int pts_open(int input, int output, int primary, void *d,
fd = get_pty();
if(fd < 0){
fd = get_pty();
if(fd < 0){
+ err = -errno;
printk("open_pts : Failed to open pts\n");
printk("open_pts : Failed to open pts\n");
- return
(-errno)
;
+ return
err
;
}
if(data->raw){
CATCH_EINTR(err = tcgetattr(fd, &data->tt));
}
if(data->raw){
CATCH_EINTR(err = tcgetattr(fd, &data->tt));
@@
-117,13
+118,6
@@
static int pty_open(int input, int output, int primary, void *d,
return(fd);
}
return(fd);
}
-static int pty_console_write(int fd, const char *buf, int n, void *d)
-{
- struct pty_chan *data = d;
-
- return(generic_console_write(fd, buf, n, &data->tt));
-}
-
struct chan_ops pty_ops = {
.type = "pty",
.init = pty_chan_init,
struct chan_ops pty_ops = {
.type = "pty",
.init = pty_chan_init,
@@
-131,7
+125,7
@@
struct chan_ops pty_ops = {
.close = generic_close,
.read = generic_read,
.write = generic_write,
.close = generic_close,
.read = generic_read,
.write = generic_write,
- .console_write =
pty
_console_write,
+ .console_write =
generic
_console_write,
.window_size = generic_window_size,
.free = generic_free,
.winch = 0,
.window_size = generic_window_size,
.free = generic_free,
.winch = 0,
@@
-144,7
+138,7
@@
struct chan_ops pts_ops = {
.close = generic_close,
.read = generic_read,
.write = generic_write,
.close = generic_close,
.read = generic_read,
.write = generic_write,
- .console_write =
pty
_console_write,
+ .console_write =
generic
_console_write,
.window_size = generic_window_size,
.free = generic_free,
.winch = 0,
.window_size = generic_window_size,
.free = generic_free,
.winch = 0,