From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 11 Jan 2006 02:51:22 +0000 (+1100)
Subject: [PATCH] powerpc: fix up iSeries console after TTY layer buffering revamp
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=415c2e083a85f0daf6cbb4988691ac3ea9279509;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

[PATCH] powerpc: fix up iSeries console after TTY layer buffering revamp

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index bead38a4a68..faee5e7acaf 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -904,6 +904,7 @@ static void vioHandleData(struct HvLpEvent *event)
 	struct viocharlpevent *cevent = (struct viocharlpevent *)event;
 	struct port_info *pi;
 	int index;
+	int num_pushed;
 	u8 port = cevent->virtual_device;
 
 	if (port >= VTTY_PORTS) {
@@ -964,6 +965,7 @@ static void vioHandleData(struct HvLpEvent *event)
 	 * functionality will only work if built into the kernel and
 	 * then only if sysrq is enabled through the proc filesystem.
 	 */
+	num_pushed = 0;
 	for (index = 0; index < cevent->len; index++) {
 #ifdef CONFIG_MAGIC_SYSRQ
 		if (sysrq_enabled) {
@@ -997,11 +999,10 @@ static void vioHandleData(struct HvLpEvent *event)
 			printk(VIOCONS_KERN_WARN "input buffer overflow!\n");
 			break;
 		}
+		num_pushed++;
 	}
 
-	/* if cevent->len == 0 then no data was added to the buffer and flip.count == 0 */
-	if (tty->flip.count)
-		/* The next call resets flip.count when the data is flushed. */
+	if (num_pushed)
 		tty_flip_buffer_push(tty);
 }