diff options
| author | Alan Cox <alan@redhat.com> | 2009-01-02 14:46:10 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-02 19:19:39 +0100 |
| commit | 36c621d82b956ff6ff72273f848af53e6c581aba (patch) | |
| tree | edd387d8275a8f25277d264ffed94e8d1c2ba048 /drivers/char/vme_scc.c | |
| parent | tty: relock the mxser driver (diff) | |
| download | linux-36c621d82b956ff6ff72273f848af53e6c581aba.tar.xz linux-36c621d82b956ff6ff72273f848af53e6c581aba.zip | |
tty: Introduce a tty_port generic block_til_ready
Start sucking more commonality out of the drivers into a single piece of
core code.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/vme_scc.c')
| -rw-r--r-- | drivers/char/vme_scc.c | 6 |
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) static int scc_carrier_raised(struct tty_port *port) { - struct scc_port *scc = container_of(port, struct scc_port, gs.port); - unsigned channel = port->channel; + struct scc_port *sc = container_of(port, struct scc_port, gs.port); + unsigned channel = sc->channel; return !!(scc_last_status_reg[channel] & SR_DCD); } @@ -643,7 +643,7 @@ static void scc_shutdown_port(void *ptr) struct scc_port *port = ptr; port->gs.port.flags &= ~ GS_ACTIVE; - if (port->gs.port.tty && port->gs.port.tty->termios->c_cflag & HUPCL) { + if (port->gs.port.tty && (port->gs.port.tty->termios->c_cflag & HUPCL)) { scc_setsignals (port, 0, 0); } } |