This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / um / drivers / pty.c

diff --git a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c
index d674171..bfa08d8 100644 (file)
--- a/arch/um/drivers/pty.c
+++ b/arch/um/drivers/pty.c
@@ -38,7 +38,7 @@ int pts_open(int input, int output, int primary, void *d, char **dev_out)
 {
        struct pty_chan *data = d;
        char *dev;
-       int fd, err;
+       int fd;
 
        fd = get_pty();
        if(fd < 0){
@@ -46,13 +46,8 @@ int pts_open(int input, int output, int primary, void *d, char **dev_out)
                return(-errno);
        }
        if(data->raw){
-               CATCH_EINTR(err = tcgetattr(fd, &data->tt));
-               if(err)
-                       return(err);
-
-               err = raw(fd);
-               if(err)
-                       return(err);
+               tcgetattr(fd, &data->tt);
+               raw(fd, 0);
        }
 
        dev = ptsname(fd);
@@ -94,19 +89,13 @@ int getmaster(char *line)
 int pty_open(int input, int output, int primary, void *d, char **dev_out)
 {
        struct pty_chan *data = d;
-       int fd, err;
+       int fd;
        char dev[sizeof("/dev/ptyxx\0")] = "/dev/ptyxx";
 
        fd = getmaster(dev);
-       if(fd < 0) 
-               return(-errno);
-       
-       if(data->raw){
-               err = raw(fd);
-               if(err)
-                       return(err);
-       }
+       if(fd < 0) return(-errno);
        
+       if(data->raw) raw(fd, 0);
        if(data->announce) (*data->announce)(dev, data->dev);
 
        sprintf(data->dev_name, "%s", dev);