X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fum%2Fdrivers%2Fxterm.c;h=dccdf3e90f9bd457c6336c0f586d2614863f3621;hb=27879d9d66f2dea19cfcd0e1df8358a33447f45b;hp=f417b3b668ade33eede3fa2de6a2f5fceec3c86b;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index f417b3b66..dccdf3e90 100644
--- 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;