diff options
| author |   SUGIOKA Toshinobu <sugioka@itonet.co.jp> | 2009-07-07 05:32:07 +0000 |
|---|---|---|
| committer |   Paul Mundt <lethal@linux-sh.org> | 2009-07-07 16:51:21 +0900 |
| commit | dd4da3a55f99efbfd46674ebefdcc2878a57ef2a (patch) | |
| tree | e65dbdbac09b7c76e89c63dbda6364b20b0a0eb3 /drivers/serial | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.31 (diff) | |
| download | linux-dev-dd4da3a55f99efbfd46674ebefdcc2878a57ef2a.tar.xz linux-dev-dd4da3a55f99efbfd46674ebefdcc2878a57ef2a.zip | |
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>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/sh-sci.c | 8 |
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) err_enabled = scr_status & (SCI_CTRL_FLAGS_REIE | SCI_CTRL_FLAGS_RIE); /* Tx Interrupt */ - if ((ssr_status & 0x0020) && (scr_status & SCI_CTRL_FLAGS_TIE)) + if ((ssr_status & SCxSR_TDxE(port)) && (scr_status & SCI_CTRL_FLAGS_TIE)) ret = sci_tx_interrupt(irq, ptr); /* Rx Interrupt */ - if ((ssr_status & 0x0002) && (scr_status & SCI_CTRL_FLAGS_RIE)) + if ((ssr_status & SCxSR_RDxF(port)) && (scr_status & SCI_CTRL_FLAGS_RIE)) ret = sci_rx_interrupt(irq, ptr); /* Error Interrupt */ - if ((ssr_status & 0x0080) && err_enabled) + if ((ssr_status & SCxSR_ERRORS(port)) && err_enabled) ret = sci_er_interrupt(irq, ptr); /* Break Interrupt */ - if ((ssr_status & 0x0010) && err_enabled) + if ((ssr_status & SCxSR_BRK(port)) && err_enabled) ret = sci_br_interrupt(irq, ptr); return ret; |