summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Lubomirski <jaylubo@motorola.com>2007-06-27 14:10:09 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-08-04 09:10:25 -0700
commited9ee0878e14d15d76ee792cac38def9d34f7f68 (patch)
tree428533d8a646ff0a025f9ea069ba7b7f47f42421
parente278ed8f82fd26097a2ed8772c1211f6c5865ce1 (diff)
downloadlinux-stable-ed9ee0878e14d15d76ee792cac38def9d34f7f68.tar.gz
linux-stable-ed9ee0878e14d15d76ee792cac38def9d34f7f68.tar.bz2
linux-stable-ed9ee0878e14d15d76ee792cac38def9d34f7f68.zip
serial: clear proper MPSC interrupt cause bits
The interrupt clearing code in mpsc_sdma_intr_ack() mistakenly clears the interrupt for both controllers instead of just the one its supposed to. This can result in the other controller appearing to hang because its interrupt was effectively lost. So, don't clear the interrupt cause bits for both MPSC controllers when clearing the interrupt for one of them. Just clear the one that is supposed to be cleared. Signed-off-by: Jay Lubomirski <jaylubo@motorola.com> Acked-by: Mark A. Greer <mgreer@mvista.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/serial/mpsc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index 3d2fcc57b1ce..64ed5ef5a612 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -502,7 +502,8 @@ mpsc_sdma_intr_ack(struct mpsc_port_info *pi)
if (pi->mirror_regs)
pi->shared_regs->SDMA_INTR_CAUSE_m = 0;
- writel(0, pi->shared_regs->sdma_intr_base + SDMA_INTR_CAUSE);
+ writeb(0x00, pi->shared_regs->sdma_intr_base + SDMA_INTR_CAUSE +
+ pi->port.line);
return;
}