aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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) {