This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index f417b3b..dccdf3e 100644 (file)
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -83,7 +83,6 @@ __uml_setup("xterm=", xterm_setup,
 "    are 'xterm=gnome-terminal,-t,-x'.\n\n"
 );
 
-/* XXX This badly needs some cleaning up in the error paths */
 int xterm_open(int input, int output, int primary, void *d, char **dev_out)
 {
        struct xterm_chan *data = d;
@@ -142,19 +141,8 @@ int xterm_open(int input, int output, int primary, void *d, char **dev_out)
                goto out;
        }
 
-       CATCH_EINTR(err = tcgetattr(new, &data->tt));
-       if(err){
-               new = err;
-               goto out;
-       }
-
-       if(data->raw){
-               err = raw(new);
-               if(err){
-                       new = err;
-                       goto out;
-               }
-       }
+       tcgetattr(new, &data->tt);
+       if(data->raw) raw(new, 0);
 
        data->pid = pid;
        *dev_out = NULL;