summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-03-02 23:29:32 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-02 23:29:32 +0000
commitb93a4afcff7be859e30cad2a305731516057d6cf (patch)
treefb5fe55864e16527e453efd18790a34db22ee2a1 /drivers/serial
parent62c132a8008991530839401674ce8e1b12b005d3 (diff)
parent9b1489e989695c4d502865f8bec616c0f17e99ab (diff)
downloadop-kernel-dev-b93a4afcff7be859e30cad2a305731516057d6cf.zip
op-kernel-dev-b93a4afcff7be859e30cad2a305731516057d6cf.tar.gz
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Conflicts: arch/arm/Makefile
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/imx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 60d665a..b801f5a 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -440,7 +440,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
temp = readl(sport->port.membase + USR2);
if (temp & USR2_BRCD) {
- writel(temp | USR2_BRCD, sport->port.membase + USR2);
+ writel(USR2_BRCD, sport->port.membase + USR2);
if (uart_handle_break(&sport->port))
continue;
}
OpenPOWER on IntegriCloud