git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
[safe/jmp/linux-2.6]
/
drivers
/
serial
/
imx.c
diff --git
a/drivers/serial/imx.c
b/drivers/serial/imx.c
index
60d665a
..
b801f5a
100644
(file)
--- 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;
}