diff options
author | Sudhir Sreedharan <ssreedharan@mvista.com> | 2014-09-22 02:30:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-28 21:49:48 -0400 |
commit | a86713b1536c818972675e6dd8c6e738f0379f1d (patch) | |
tree | e1cbfdd7711b08f77542b2133fdc45400428c775 /drivers/tty | |
parent | daea65a7be76953bb80d13d0ac43e7441fd42cdf (diff) |
serial/core: Initialize the console pm state
For console devices having UART_CAP_SLEEP capability, the uart_pm_state has
to be initialized to UART_PM_STATE_ON. Otherwise the LCR regiser values
are reinitialized when uart_change_pm is called from uart_configure_port.
Signed-off-by: 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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index df3a8c74358e..e7d9d65095da 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c | |||
@@ -2606,6 +2606,9 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport) | |||
2606 | if (uport->cons && uport->dev) | 2606 | if (uport->cons && uport->dev) |
2607 | of_console_check(uport->dev->of_node, uport->cons->name, uport->line); | 2607 | of_console_check(uport->dev->of_node, uport->cons->name, uport->line); |
2608 | 2608 | ||
2609 | if (uart_console(uport)) | ||
2610 | state->pm_state = UART_PM_STATE_ON; | ||
2611 | |||
2609 | uart_configure_port(drv, state, uport); | 2612 | uart_configure_port(drv, state, uport); |
2610 | 2613 | ||
2611 | num_groups = 2; | 2614 | num_groups = 2; |