diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-06-13 21:29:37 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-06-13 21:29:37 +0200 |
| commit | 6303791f24e88b81b858fbacd26523ac4af8ef83 (patch) | |
| tree | d75a11331a3b775d7db7e281c909b610fb9e03f6 /drivers/tty | |
| parent | e5cf67e56e4f4e7dc90ea645f011d35ad5f7a271 (diff) | |
| parent | 26a7895e70104811258cf023d06a21f92ab590c6 (diff) | |
| download | kernel_samsung_crespo-6303791f24e88b81b858fbacd26523ac4af8ef83.zip kernel_samsung_crespo-6303791f24e88b81b858fbacd26523ac4af8ef83.tar.gz kernel_samsung_crespo-6303791f24e88b81b858fbacd26523ac4af8ef83.tar.bz2 | |
Merge branch 'linux-3.0.y' into HEAD
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/mxs-auart.c | 2 | ||||
| -rw-r--r-- | drivers/tty/serial/serial_core.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index 7e02c9c..5b3d063 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c @@ -368,6 +368,8 @@ static void mxs_auart_settermios(struct uart_port *u, writel(ctrl, u->membase + AUART_LINECTRL); writel(ctrl2, u->membase + AUART_CTRL2); + + uart_update_timeout(u, termios->c_cflag, baud); } static irqreturn_t mxs_auart_irq_handle(int irq, void *context) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 5668b3e..2a106a9 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -2328,6 +2328,7 @@ void uart_unregister_driver(struct uart_driver *drv) tty_unregister_driver(p); put_tty_driver(p); kfree(drv->state); + drv->state = NULL; drv->tty_driver = NULL; } |