summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/serial_core.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-09-15 00:02:28 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-09-15 00:02:28 +0100
commit1db3706b05b11abcf2673ffbed5ad43b4c90ed11 (patch)
tree09fa867d9d9db6ed475eaa889da143603441e1a6 /drivers/tty/serial/serial_core.c
parentad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (diff)
parent63d15148b6058ab0037343390e8918503ed81968 (diff)
Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'drivers/tty/serial/serial_core.c')
-rw-r--r--drivers/tty/serial/serial_core.c5
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;