diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-13 06:46:35 (GMT) |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-13 06:46:35 (GMT) |
| commit | 4ae26f46c98f58ef19ad34f475617b40740d2faa (patch) | |
| tree | b386703da70cb1ef807c165d0a00fc44be1dbd40 | |
| parent | ef7fc9026fe6adef13870c6b2cb4642b6193af67 (diff) | |
| download | linux-4ae26f46c98f58ef19ad34f475617b40740d2faa.tar.xz | |
serial: sh-sci: build fixes.
This fixes up the port_rx_irq_mask() REIE flag definition as well as a
debug printk blowing up on the SCSCR_INIT having gone away.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | drivers/serial/sh-sci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 251c08c..92c91c8 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c @@ -794,7 +794,7 @@ static inline unsigned long port_rx_irq_mask(struct uart_port *port) * it's unset, it's logically inferred that there's no point in * testing for it. */ - return SCSCR_RIE | (to_sci_port(port)->scscr & SCSR_REIE); + return SCSCR_RIE | (to_sci_port(port)->scscr & SCSCR_REIE); } static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr) @@ -1540,7 +1540,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, sci_out(port, SCSMR, smr_val); dev_dbg(port->dev, "%s: SMR %x, t %x, SCSCR %x\n", __func__, smr_val, t, - SCSCR_INIT(port)); + s->scscr); if (t > 0) { if (t >= 256) { |