aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/vme_scc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/vme_scc.c')
-rw-r--r--drivers/char/vme_scc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/vme_scc.c b/drivers/char/vme_scc.c
index d4e1534c0e03..2d9242a45a0d 100644
--- a/drivers/char/vme_scc.c
+++ b/drivers/char/vme_scc.c
@@ -631,8 +631,8 @@ static void scc_enable_rx_interrupts(void *ptr)
631 631
632static int scc_carrier_raised(struct tty_port *port) 632static int scc_carrier_raised(struct tty_port *port)
633{ 633{
634 struct scc_port *scc = container_of(port, struct scc_port, gs.port); 634 struct scc_port *sc = container_of(port, struct scc_port, gs.port);
635 unsigned channel = port->channel; 635 unsigned channel = sc->channel;
636 636
637 return !!(scc_last_status_reg[channel] & SR_DCD); 637 return !!(scc_last_status_reg[channel] & SR_DCD);
638} 638}
@@ -643,7 +643,7 @@ static void scc_shutdown_port(void *ptr)
643 struct scc_port *port = ptr; 643 struct scc_port *port = ptr;
644 644
645 port->gs.port.flags &= ~ GS_ACTIVE; 645 port->gs.port.flags &= ~ GS_ACTIVE;
646 if (port->gs.port.tty && port->gs.port.tty->termios->c_cflag & HUPCL) { 646 if (port->gs.port.tty && (port->gs.port.tty->termios->c_cflag & HUPCL)) {
647 scc_setsignals (port, 0, 0); 647 scc_setsignals (port, 0, 0);
648 } 648 }
649} 649}