diff --git a/[refs] b/[refs]
index 2daae789fa08..900986fa7684 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c2381af0d3ef62a681dac5a141b6dabb27bf2e1
+refs/heads/master: 51d33021425e1f905beb4208823146f2fb6517da
diff --git a/trunk/arch/powerpc/platforms/pseries/hvconsole.c b/trunk/arch/powerpc/platforms/pseries/hvconsole.c
index 3f6a89b09816..041e87ca1893 100644
--- a/trunk/arch/powerpc/platforms/pseries/hvconsole.c
+++ b/trunk/arch/powerpc/platforms/pseries/hvconsole.c
@@ -73,7 +73,7 @@ int hvc_put_chars(uint32_t vtermno, const char *buf, int count)
 	if (ret == H_SUCCESS)
 		return count;
 	if (ret == H_BUSY)
-		return 0;
+		return -EAGAIN;
 	return -EIO;
 }