summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-02 21:33:50 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-02 21:33:50 -0700
commit69784fa539efa477f39b5a849c27d5e630e0db27 (patch)
treec126757030db2ff5747260e68061b7402c2de55b /drivers/tty
parentbaeb7ef34952f523a129e5d1369aa42ecbe7f8c9 (diff)
downloadlinux-69784fa539efa477f39b5a849c27d5e630e0db27.tar.bz2
Revert "serial/core: Initialize the console pm state"
This reverts commit a86713b1536c818972675e6dd8c6e738f0379f1d. Kevin Hilman writes: Multiple boot failures on ARM[1] were bisected down to this patch. How was this patch tested, and on which platforms? Also, the changelog states that this should be done only for UART_CAP_SLEEP, but the patch does it for every UART. Greg, I suggest this patch be dropped from tty-next until it has been better described and tested. [1] http://lists.linaro.org/pipermail/kernel-build-reports/2014-October/005550.html Reported-by: Kevin Hilman <khilman@kernel.org> Cc: Sudhir Sreedharan <ssreedharan@mvista.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/serial_core.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index e7d9d65095da..df3a8c74358e 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2606,9 +2606,6 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
if (uport->cons && uport->dev)
of_console_check(uport->dev->of_node, uport->cons->name, uport->line);
- if (uart_console(uport))
- state->pm_state = UART_PM_STATE_ON;
-
uart_configure_port(drv, state, uport);
num_groups = 2;