---

yaml --- r: 196341 b: refs/heads/master c: 3f255eb h: refs/heads/master i: 196339: c4ca9da v: v3
git-mirror · May 21, 2010 · 473b08f · 473b08f
1 parent 342e986
commit 473b08f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5316b4aea024da9266d740322a5481657f6ce59
+refs/heads/master: 3f255eb37e97e97dfec7cb8d4c75d543de231812
diff --git a/trunk/drivers/serial/sh-sci.c b/trunk/drivers/serial/sh-sci.c
@@ -151,7 +151,11 @@ static int sci_poll_get_char(struct uart_port *port)
 			handle_error(port);
 			continue;
 		}
-	} while (!(status & SCxSR_RDxF(port)));
+		break;
+	} while (1);
+
+	if (!(status & SCxSR_RDxF(port)))
+		return NO_POLL_CHAR;
 
 	c = sci_in(port, SCxRDR);