---

yaml --- r: 167493 b: refs/heads/master c: 514fc01 h: refs/heads/master i: 167491: 0a3f4c1 v: v3
git-mirror · Oct 14, 2009 · e87d7b2 · e87d7b2
1 parent 045d9ef
commit e87d7b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43046b606673c9c991919ff75b980b72541e9ede
+refs/heads/master: 514fc01d389cf5d364ee3b5fec4ac1487448803e
diff --git 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);
 }
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
     }
     /**
@@ Expand Down @@