diff options
author | Eric Miao <eric.miao@linaro.org> | 2011-12-23 05:30:21 +0800 |
---|---|---|
committer | Eric Miao <eric.miao@linaro.org> | 2012-01-06 12:11:36 +0800 |
commit | 1c7bb81885f56666a4eaf934989c6607120add30 (patch) | |
tree | dcaf9482bc5ada6821d82b5082ed1f8b685af28a | |
parent | 4f0c43b5a5ef59f7993f8ef25dc96c8aa1366608 (diff) |
tty: serial: imx: move del_timer_sync() to avoid potential deadlock
del_timer_sync() acquires its own lock and doesn't have to be nested
within the spinlock of sport->port.lock in imx_set_termios(), which
will cause potential deadlock. Fix this by moving it outside.
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Eric Miao <eric.miao@linaro.org>
-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 163fc9021f5..e018aef88df 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -901,6 +901,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. */ @@ -931,8 +933,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. */ |