uml: fix console writing bugs

[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 77557e233f58f683586d71b5d918324591e53eb3..d29e56d8ced462764ecf721dbaf97af9d399908c 100644 (file)
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
@@ -38,7 +38,16 @@ int generic_read(int fd, char *c_out, void *unused)
 
 int generic_write(int fd, const char *buf, int n, void *unused)
 {
-       return write(fd, buf, n);
+       int err;
+
+       err = write(fd, buf, n);
+       if (err > 0)
+               return err;
+       else if (errno == EAGAIN)
+               return 0;
+       else if (err == 0)
+               return -EIO;
+       return -errno;
 }
 
 int generic_window_size(int fd, void *unused, unsigned short *rows_out,