summaryrefslogtreecommitdiffstats
path: root/drivers/char/serial167.c
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2008-04-30 09:53:59 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 17:29:45 +0200
commit978e595f88a1fba5869aa42a4af4fba36f33ecac (patch)
tree60848f49949c5b7b518621ee36cdc6d500244539 /drivers/char/serial167.c
parentdrivers/char/ds1286.c: use time_before, time_before_eq, etc (diff)
downloadlinux-978e595f88a1fba5869aa42a4af4fba36f33ecac.tar.xz
linux-978e595f88a1fba5869aa42a4af4fba36f33ecac.zip
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/serial167.c')
-rw-r--r--drivers/char/serial167.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index f62fb9360c3f..62d6f2e0fd18 100644
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -1674,8 +1674,7 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
if (info->flags & ASYNC_INITIALIZED)
tty_wait_until_sent(tty, 3000); /* 30 seconds timeout */
shutdown(info);
- if (tty->driver->flush_buffer)
- tty->driver->flush_buffer(tty);
+ cy_flush_buffer(tty);
tty_ldisc_flush(tty);
info->tty = NULL;
if (info->blocked_open) {