aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/esp.c
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2008-04-30 03:53:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 11:29:45 -0400
commit978e595f88a1fba5869aa42a4af4fba36f33ecac (patch)
tree60848f49949c5b7b518621ee36cdc6d500244539 /drivers/char/esp.c
parentac0e4b7d319bf284bb64bc7e1c051417386b34a4 (diff)
tty/serial: lay the foundations for the next set of reworks
- Stop drivers calling their own flush method indirectly, it obfuscates code and it will change soon anyway - A few more lock_kernel paths temporarily needed in some driver internal waiting code - Remove private put_char method that does a write call for one char - we have that anyway - Most but not yet all of the termios copy under lock fixing (some has other dependencies to follow) - Note a few locking bugs in drivers found in the process - Kill remaining [ab]users of TIOCG/SSOFTCAR in the driver, these must go to fix the termios locking Signed-off-by: Alan Cox <alan@redhat.com> Cc: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/esp.c')
-rw-r--r--drivers/char/esp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/esp.c b/drivers/char/esp.c
index 662e9cfdcc96..b1f92db31331 100644
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
@@ -1994,8 +1994,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
1994 rs_wait_until_sent(tty, info->timeout); 1994 rs_wait_until_sent(tty, info->timeout);
1995 } 1995 }
1996 shutdown(info); 1996 shutdown(info);
1997 if (tty->driver->flush_buffer) 1997 rs_flush_buffer(tty);
1998 tty->driver->flush_buffer(tty);
1999 tty_ldisc_flush(tty); 1998 tty_ldisc_flush(tty);
2000 tty->closing = 0; 1999 tty->closing = 0;
2001 info->tty = NULL; 2000 info->tty = NULL;