aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-01-13 01:46:35 -0500
committerPaul Mundt <lethal@linux-sh.org>2011-01-13 01:46:35 -0500
commit4ae26f46c98f58ef19ad34f475617b40740d2faa (patch)
treeb386703da70cb1ef807c165d0a00fc44be1dbd40 /drivers/serial
parentef7fc9026fe6adef13870c6b2cb4642b6193af67 (diff)
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>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/sh-sci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 251c08c55ae0..92c91c83edde 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)
794 * it's unset, it's logically inferred that there's no point in 794 * it's unset, it's logically inferred that there's no point in
795 * testing for it. 795 * testing for it.
796 */ 796 */
797 return SCSCR_RIE | (to_sci_port(port)->scscr & SCSR_REIE); 797 return SCSCR_RIE | (to_sci_port(port)->scscr & SCSCR_REIE);
798} 798}
799 799
800static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr) 800static 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,
1540 sci_out(port, SCSMR, smr_val); 1540 sci_out(port, SCSMR, smr_val);
1541 1541
1542 dev_dbg(port->dev, "%s: SMR %x, t %x, SCSCR %x\n", __func__, smr_val, t, 1542 dev_dbg(port->dev, "%s: SMR %x, t %x, SCSCR %x\n", __func__, smr_val, t,
1543 SCSCR_INIT(port)); 1543 s->scscr);
1544 1544
1545 if (t > 0) { 1545 if (t > 0) {
1546 if (t >= 256) { 1546 if (t >= 256) {