summaryrefslogtreecommitdiff
path: root/drivers/tty/tty_ldisc.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-11-27 13:41:11 +0100
committerTakashi Iwai <tiwai@suse.de>2015-11-27 13:41:11 +0100
commit3fb42daaf11c4be8e0626b733916f3a7b65bcfae (patch)
treed40ab1904047d2db03c9f6e9b538e01d62415646 /drivers/tty/tty_ldisc.c
parentefdbe3c3edb6c8c98a8be863f60916780a5375c1 (diff)
parent06a691e64b11323a735db3c3bd909d3c0712698f (diff)
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/tty/tty_ldisc.c')
-rw-r--r--drivers/tty/tty_ldisc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 5af8f1874c1a..629e3c865072 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -592,7 +592,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
/* Restart the work queue in case no characters kick it off. Safe if
already running */
- schedule_work(&tty->port->buf.work);
+ tty_buffer_restart_work(tty->port);
tty_unlock(tty);
return retval;