Merge master.kernel.org:/home/rmk/linux-2.6-serial (509b70b6) · Commits · 戴 / test

drivers/serial/serial_core.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -1907,10 +1907,13 @@ uart_set_options(struct uart_port port, struct console co,
		static void uart_change_pm(struct uart_state *state, int pm_state)
		{
		struct uart_port *port = state->port;

		if (state->pm_state != pm_state) {
		if (port->ops->pm)
		port->ops->pm(port, pm_state, state->pm_state);
		state->pm_state = pm_state;
		}
		}

		int uart_suspend_port(struct uart_driver drv, struct uart_port port)
		{