aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSUGIOKA Toshinobu <sugioka@itonet.co.jp>2009-07-07 01:32:07 -0400
committerPaul Mundt <lethal@linux-sh.org>2009-07-07 03:51:21 -0400
commitdd4da3a55f99efbfd46674ebefdcc2878a57ef2a (patch)
treee65dbdbac09b7c76e89c63dbda6364b20b0a0eb3
parent2b5c0c72ea404d6b554a8284031dd78748314b9e (diff)
serial: sh-sci: fix sci interrupt handler
Fix up the error bit handling on SCI ports. Signed-off-by: SUGIOKA Toshinobu <sugioka@itonet.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/serial/sh-sci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 12bd64684f12..8e2feb563347 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -716,16 +716,16 @@ static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
716 err_enabled = scr_status & (SCI_CTRL_FLAGS_REIE | SCI_CTRL_FLAGS_RIE); 716 err_enabled = scr_status & (SCI_CTRL_FLAGS_REIE | SCI_CTRL_FLAGS_RIE);
717 717
718 /* Tx Interrupt */ 718 /* Tx Interrupt */
719 if ((ssr_status & 0x0020) && (scr_status & SCI_CTRL_FLAGS_TIE)) 719 if ((ssr_status & SCxSR_TDxE(port)) && (scr_status & SCI_CTRL_FLAGS_TIE))
720 ret = sci_tx_interrupt(irq, ptr); 720 ret = sci_tx_interrupt(irq, ptr);
721 /* Rx Interrupt */ 721 /* Rx Interrupt */
722 if ((ssr_status & 0x0002) && (scr_status & SCI_CTRL_FLAGS_RIE)) 722 if ((ssr_status & SCxSR_RDxF(port)) && (scr_status & SCI_CTRL_FLAGS_RIE))
723 ret = sci_rx_interrupt(irq, ptr); 723 ret = sci_rx_interrupt(irq, ptr);
724 /* Error Interrupt */ 724 /* Error Interrupt */
725 if ((ssr_status & 0x0080) && err_enabled) 725 if ((ssr_status & SCxSR_ERRORS(port)) && err_enabled)
726 ret = sci_er_interrupt(irq, ptr); 726 ret = sci_er_interrupt(irq, ptr);
727 /* Break Interrupt */ 727 /* Break Interrupt */
728 if ((ssr_status & 0x0010) && err_enabled) 728 if ((ssr_status & SCxSR_BRK(port)) && err_enabled)
729 ret = sci_br_interrupt(irq, ptr); 729 ret = sci_br_interrupt(irq, ptr);
730 730
731 return ret; 731 return ret;