This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c
index 42cba3f..33c6c78 100644 (file)
--- a/arch/um/drivers/fd.c
+++ b/arch/um/drivers/fd.c
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <termios.h>
-#include <errno.h>
 #include "user.h"
 #include "user_util.h"
 #include "chan_user.h"
@@ -46,16 +45,10 @@ void *fd_init(char *str, int device, struct chan_opts *opts)
 int fd_open(int input, int output, int primary, void *d, char **dev_out)
 {
        struct fd_chan *data = d;
-       int err;
 
        if(data->raw && isatty(data->fd)){
-               CATCH_EINTR(err = tcgetattr(data->fd, &data->tt));
-               if(err)
-                       return(err);
-
-               err = raw(data->fd);
-               if(err)
-                       return(err);
+               tcgetattr(data->fd, &data->tt);
+               raw(data->fd, 0);
        }
        sprintf(data->str, "%d", data->fd);
        *dev_out = data->str;
@@ -65,13 +58,9 @@ int fd_open(int input, int output, int primary, void *d, char **dev_out)
 void fd_close(int fd, void *d)
 {
        struct fd_chan *data = d;
-       int err;
 
        if(data->raw && isatty(fd)){
-               CATCH_EINTR(err = tcsetattr(fd, TCSAFLUSH, &data->tt));
-               if(err)
-                       printk("Failed to restore terminal state - " 
-                              "errno = %d\n", -err);
+               tcsetattr(fd, TCSAFLUSH, &data->tt);
                data->raw = 0;
        }
 }