1 files changed, 8 insertions, 1 deletions

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 368d3e97dfd9..629b00e3b0b0 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -157,7 +157,7 @@ static void tty_receive_char(struct tty_struct *tty, char ch)
 
 static int open_one_chan(struct chan *chan)
 {
-        int fd;
+        int fd, err;
 
         if(chan->opened)
                 return 0;
@@ -168,6 +168,13 @@ static int open_one_chan(struct chan *chan)
                                      chan->data, &chan->dev);
         if(fd < 0)
                 return fd;
+
+        err = os_set_fd_block(fd, 0);
+        if (err) {
+                (*chan->ops->close)(fd, chan->data);
+                return err;
+        }
+
         chan->fd = fd;
 
         chan->opened = 1;