From dc6a449af8b351c90e422521c185196d80451bfa Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Oct 2009 09:20:41 -0700
Subject: [PATCH] --- yaml --- r: 167501 b: refs/heads/master c:
 97ad5a034dcc164269d0b8a5cb3e827b33455c11 h: refs/heads/master i:   167499:
 9134d5332074d7cf6e2114bd4cf42b30cc08e1f8 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/char/tty_buffer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4da927421559..8e478f2ca026 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c53e46314562fe814b0afef6cfcbd2f562b017c
+refs/heads/master: 97ad5a034dcc164269d0b8a5cb3e827b33455c11
diff --git a/trunk/drivers/char/tty_buffer.c b/trunk/drivers/char/tty_buffer.c
index 0296612cc7df..66fa4e10d76b 100644
--- a/trunk/drivers/char/tty_buffer.c
+++ b/trunk/drivers/char/tty_buffer.c
@@ -468,7 +468,7 @@ static void flush_to_ldisc(struct work_struct *work)
  */
 void tty_flush_to_ldisc(struct tty_struct *tty)
 {
-	flush_to_ldisc(&tty->buf.work.work);
+	flush_delayed_work(&tty->buf.work);
 }
 
 /**