Commit 509b70b6 authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/rmk/linux-2.6-serial

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [ARM] 3523/1: Serial core pm_state
parents 716f8954 1281e360
...@@ -1907,9 +1907,12 @@ uart_set_options(struct uart_port *port, struct console *co, ...@@ -1907,9 +1907,12 @@ uart_set_options(struct uart_port *port, struct console *co,
static void uart_change_pm(struct uart_state *state, int pm_state) static void uart_change_pm(struct uart_state *state, int pm_state)
{ {
struct uart_port *port = state->port; struct uart_port *port = state->port;
if (state->pm_state != pm_state) {
if (port->ops->pm) if (port->ops->pm)
port->ops->pm(port, pm_state, state->pm_state); port->ops->pm(port, pm_state, state->pm_state);
state->pm_state = pm_state; state->pm_state = pm_state;
}
} }
int uart_suspend_port(struct uart_driver *drv, struct uart_port *port) int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment