Commit e54e74ca authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] fix up tty fall-out

The two patches below (compile)fix some fall-out from the tty cleanups.
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 797713b4
...@@ -691,7 +691,7 @@ void gs_close(struct tty_struct * tty, struct file * filp) ...@@ -691,7 +691,7 @@ void gs_close(struct tty_struct * tty, struct file * filp)
unsigned long flags; unsigned long flags;
struct gs_port *port; struct gs_port *port;
func_enter () func_enter ();
if (!tty) return; if (!tty) return;
......
...@@ -952,7 +952,7 @@ static void moxa_poll(unsigned long ignored) ...@@ -952,7 +952,7 @@ static void moxa_poll(unsigned long ignored)
if (MoxaPortTxQueue(ch->port) <= WAKEUP_CHARS) { if (MoxaPortTxQueue(ch->port) <= WAKEUP_CHARS) {
if (!tp->stopped) { if (!tp->stopped) {
ch->statusflags &= ~LOWWAIT; ch->statusflags &= ~LOWWAIT;
tty_wakeup(tty); tty_wakeup(tp);
wake_up_interruptible(&tp->write_wait); wake_up_interruptible(&tp->write_wait);
} }
} }
...@@ -1119,7 +1119,7 @@ static void check_xmit_empty(unsigned long data) ...@@ -1119,7 +1119,7 @@ static void check_xmit_empty(unsigned long data)
if (ch->tty && (ch->statusflags & EMPTYWAIT)) { if (ch->tty && (ch->statusflags & EMPTYWAIT)) {
if (MoxaPortTxQueue(ch->port) == 0) { if (MoxaPortTxQueue(ch->port) == 0) {
ch->statusflags &= ~EMPTYWAIT; ch->statusflags &= ~EMPTYWAIT;
tty_wakeup(tty); tty_wakeup(ch->tty);
wake_up_interruptible(&ch->tty->write_wait); wake_up_interruptible(&ch->tty->write_wait);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment