This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
index b62f8e2..8a5180a 100644 (file)
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
@@ -27,26 +27,14 @@ int generic_console_write(int fd, const char *buf, int n, void *unused)
        int err;
 
        if(isatty(fd)){
-               CATCH_EINTR(err = tcgetattr(fd, &save));
-               if (err)
-                       goto error;
+               tcgetattr(fd, &save);
                new = save;
-               /* The terminal becomes a bit less raw, to handle \n also as
-                * "Carriage Return", not only as "New Line". Otherwise, the new
-                * line won't start at the first column.*/
                new.c_oflag |= OPOST;
-               CATCH_EINTR(err = tcsetattr(fd, TCSAFLUSH, &new));
-               if (err)
-                       goto error;
+               tcsetattr(fd, TCSAFLUSH, &new);
        }
        err = generic_write(fd, buf, n, NULL);
-       /* Restore raw mode, in any case; we *must* ignore any error apart
-        * EINTR, except for debug.*/
-       if(isatty(fd))
-               CATCH_EINTR(tcsetattr(fd, TCSAFLUSH, &save));
+       if(isatty(fd)) tcsetattr(fd, TCSAFLUSH, &save);
        return(err);
-error:
-       return(-errno);
 }
 
 static void winch_handler(int sig)