diff --git a/[refs] b/[refs] index fb65289962cf..162c232bcd80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e4d376c664ded7cb9cc1c7d0cae67c9672e46b1 +refs/heads/master: c0754c99a6bcfcba7e1d68b75e3f25cb367af0fa diff --git a/trunk/drivers/serial/68360serial.c b/trunk/drivers/serial/68360serial.c index f59463601874..6f540107d0bb 100644 --- a/trunk/drivers/serial/68360serial.c +++ b/trunk/drivers/serial/68360serial.c @@ -1282,7 +1282,7 @@ static int rs_360_tiocmset(struct tty_struct *tty, struct file *file, if (tty->flags & (1 << TTY_IO_ERROR)) return -EIO; - + /* FIXME: locking on info->mcr */ if (set & TIOCM_RTS) info->mcr |= UART_MCR_RTS; if (set & TIOCM_DTR)