1 files changed, 7 insertions, 0 deletions

diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index 571c2b3325d5..fe238e03a300 100644
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -151,6 +151,13 @@ int xterm_open(int input, int output, int primary, void *d,
                 goto out;
         }
 
+        err = os_set_fd_block(new, 0);
+        if (err) {
+                printk("xterm_open : failed to set xterm descriptor "
+                       "non-blocking, err = %d\n", -err);
+                goto out;
+        }
+
         CATCH_EINTR(err = tcgetattr(new, &data->tt));
         if(err){
                 new = err;