Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[firefly-linux-kernel-4.4.55.git] / drivers / tty / hvc / hvc_tile.c

diff --git a/drivers/tty/hvc/hvc_tile.c b/drivers/tty/hvc/hvc_tile.c
index 3f6cd3102db5238ba4998c1b5ad64b831e9b6abf..9da1e842bbe93b6883299e625d0dc411f85abb22 100644 (file)
--- a/drivers/tty/hvc/hvc_tile.c
+++ b/drivers/tty/hvc/hvc_tile.c
@@ -51,7 +51,8 @@ int tile_console_write(const char *buf, int count)
                              _SIM_CONTROL_OPERATOR_BITS));
                return 0;
        } else {
-               return hv_console_write((HV_VirtAddr)buf, count);
+               /* Translate 0 bytes written to EAGAIN for hvc_console_print. */
+               return hv_console_write((HV_VirtAddr)buf, count) ?: -EAGAIN;
        }
 }