From 2a2781190a8265c59a05b1ab7e5ea2b9eaa0028e Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 22 Dec 2010 17:09:08 +0000 Subject: [PATCH] --- yaml --- r: 225783 b: refs/heads/master c: 5063e2c567ee569cccfc01ebf80c898cb4e6833a h: refs/heads/master i: 225781: 2bbd281f72295e4a829610ad4d4122029b3b6ad0 225779: 3ec5f1e7747eddcd231b53c4ff96f8963f4f0332 225775: ee5b38544506f5955d10b3b8b8e072db2c38df8d v: v3 --- [refs] | 2 +- trunk/drivers/serial/amba-pl011.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 01e7c1645765..79fd1e1c5270 100644 --- 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 index 2c07939be02c..c77b3eb5142d 100644 --- 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 */