diff --git a/[refs] b/[refs] index 3f17fa6f1900..744e87631fff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05f225dc8729d3e5703b8c34e750fdca67bcefe6 +refs/heads/master: 283fef59d6e934e8da11631446ea8e2e93fce14c diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c index 8b2a59969868..bd74e82d8a72 100644 --- a/trunk/drivers/char/tty_io.c +++ b/trunk/drivers/char/tty_io.c @@ -2621,10 +2621,9 @@ int tty_ioctl(struct inode * inode, struct file * file, tty->driver->break_ctl(tty, 0); return 0; case TCSBRK: /* SVID version: non-zero arg --> no break */ - /* - * XXX is the above comment correct, or the - * code below correct? Is this ioctl used at - * all by anyone? + /* non-zero arg means wait for all output data + * to be sent (performed above) but don't send break. + * This is used by the tcdrain() termios function. */ if (!arg) return send_break(tty, 250);