summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorYin Kangkai <kangkai.yin@linux.intel.com>2011-02-09 11:34:20 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 11:23:49 -0800
commit95926d2db6256e08d06b753752a0d903a0580acc (patch)
treec1ac11f747459546100af15ff1ed7bc2a6ea3876 /drivers/tty
parent8115be01462f8af2dc22dd65dd28268bb9b8bff6 (diff)
downloadlinux-stable-95926d2db6256e08d06b753752a0d903a0580acc.tar.gz
linux-stable-95926d2db6256e08d06b753752a0d903a0580acc.tar.bz2
linux-stable-95926d2db6256e08d06b753752a0d903a0580acc.zip
serial: also set the uartclk value in resume after goes to highspeed
For any reason if the NS16550A was not work in high speed mode (e.g. we hold NS16550A from going to high speed mode in autoconfig_16550a()), now we are resume from suspend, we should also set the uartclk to the correct value. Otherwise it is still the old 1843200 and that will bring issues. CC: Greg Kroah-Hartman <greg@kroah.com> CC: David Woodhouse <dwmw2@infradead.org> CC: linux-kernel@vger.kernel.org CC: stable@kernel.org Signed-off-by: Yin Kangkai <kangkai.yin@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/8250.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c
index 3975df6f7fdb..c10a6a909c76 100644
--- a/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250.c
@@ -3036,6 +3036,7 @@ void serial8250_resume_port(int line)
serial_outp(up, 0x04, tmp);
serial_outp(up, UART_LCR, 0);
+ up->port.uartclk = 921600*16;
}
uart_resume_port(&serial8250_reg, &up->port);
}