diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 20:19:28 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 20:19:28 +0900 |
| commit | 7119888df1fd115573616ae43747b2e823b0663e (patch) | |
| tree | cfe0c769b4e7bf8323d1958c46590d6200516a29 /drivers/serial/sh-sci.c | |
| parent | c652d780c9cf7f860141de232b37160fe013feca (diff) | |
| parent | 0f60bb25b4036d30fd795709be09626c58c52464 (diff) | |
| download | linux-7119888df1fd115573616ae43747b2e823b0663e.tar.gz linux-7119888df1fd115573616ae43747b2e823b0663e.tar.bz2 linux-7119888df1fd115573616ae43747b2e823b0663e.zip | |
Merge branches 'sh/ftrace' and 'sh/cachetlb'
Diffstat (limited to 'drivers/serial/sh-sci.c')
| -rw-r--r-- | drivers/serial/sh-sci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 66f52674ca0c..12bd64684f12 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c @@ -707,12 +707,13 @@ static irqreturn_t sci_br_interrupt(int irq, void *ptr) static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr) { - unsigned short ssr_status, scr_status; + unsigned short ssr_status, scr_status, err_enabled; struct uart_port *port = ptr; irqreturn_t ret = IRQ_NONE; ssr_status = sci_in(port, SCxSR); scr_status = sci_in(port, SCSCR); + err_enabled = scr_status & (SCI_CTRL_FLAGS_REIE | SCI_CTRL_FLAGS_RIE); /* Tx Interrupt */ if ((ssr_status & 0x0020) && (scr_status & SCI_CTRL_FLAGS_TIE)) @@ -721,10 +722,10 @@ static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr) if ((ssr_status & 0x0002) && (scr_status & SCI_CTRL_FLAGS_RIE)) ret = sci_rx_interrupt(irq, ptr); /* Error Interrupt */ - if ((ssr_status & 0x0080) && (scr_status & SCI_CTRL_FLAGS_REIE)) + if ((ssr_status & 0x0080) && err_enabled) ret = sci_er_interrupt(irq, ptr); /* Break Interrupt */ - if ((ssr_status & 0x0010) && (scr_status & SCI_CTRL_FLAGS_REIE)) + if ((ssr_status & 0x0010) && err_enabled) ret = sci_br_interrupt(irq, ptr); return ret; |