diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-09-05 12:52:08 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-09-05 12:52:08 +0900 |
commit | f5a18f932e051ff0f19dcd80a421a4dd9b11f10f (patch) | |
tree | 9189ffc9fa735e5297ed8c3678a9463e8dbb1561 /drivers/tty/serial/serial_core.c | |
parent | b9a3acf46afdafc601947136f63e9dd228cd86e8 (diff) | |
parent | 9e79e3e9dd9672b37ac9412e9a926714306551fe (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Diffstat (limited to 'drivers/tty/serial/serial_core.c')
-rw-r--r-- | drivers/tty/serial/serial_core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index db7912cb7ae..a3efbea5dbb 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -200,6 +200,11 @@ static int uart_startup(struct tty_struct *tty, struct uart_state *state, int in clear_bit(TTY_IO_ERROR, &tty->flags); } + /* + * This is to allow setserial on this port. People may want to set + * port/irq/type and then reconfigure the port properly if it failed + * now. + */ if (retval && capable(CAP_SYS_ADMIN)) retval = 0; |