---

yaml --- r: 225783 b: refs/heads/master c: 5063e2c h: refs/heads/master i: 225781: 2bbd281 225779: 3ec5f1e 225775: ee5b385 v: v3
git-mirror · Jan 5, 2011 · 2a27811 · 2a27811
1 parent ebf78aa
commit 2a27811
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8a7ba86ff993311f8712e5b3bb2e3892e82df5f
+refs/heads/master: 5063e2c567ee569cccfc01ebf80c898cb4e6833a
diff --git a/trunk/drivers/serial/amba-pl011.c b/trunk/drivers/serial/amba-pl011.c
@@ -424,6 +424,10 @@ static int pl011_startup(struct uart_port *port)
 	cr = UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
 	writew(cr, uap->port.membase + UART011_CR);
 
+	/* Clear pending error interrupts */
+	writew(UART011_OEIS | UART011_BEIS | UART011_PEIS | UART011_FEIS,
+	       uap->port.membase + UART011_ICR);
+
 	/*
 	 * initialise the old status of the modem signals
 	 */