diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-12-30 22:36:48 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-12-30 22:36:48 +0800 |
| commit | 607ad004f58109213c0b26d98a5b33b5fad47619 (patch) | |
| tree | 9d3a7b6543ddb3812425dabb9316596d4842ecc9 /drivers | |
| parent | 1db0d5d95749e01ad551bb51a2ee3fddafed9043 (diff) | |
| parent | a85a22ffee0810f5048d8e1977cdb05c3c051a86 (diff) | |
Merge branch 'topic/lt-3.2-imx6-base' into lt-3.2-imx6
* topic/lt-3.2-imx6-base:
ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation
tty: serial: imx: move del_timer_sync() to avoid potential deadlock
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/imx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 39bbce40e32..0f4ba212fd6 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -904,6 +904,8 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, ucr2 |= UCR2_PROE; } + del_timer_sync(&sport->timer); + /* * Ask the core to calculate the divisor for us. */ @@ -934,8 +936,6 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios, sport->port.ignore_status_mask |= URXD_OVRRUN; } - del_timer_sync(&sport->timer); - /* * Update the per-port timeout. */ |