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);
 }
 
 /**