From bee6bcbb1f555dbd39a3edaee3384f20ccd00c1d Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 25 Aug 2011 15:12:05 +0200 Subject: [PATCH] --- yaml --- r: 267316 b: refs/heads/master c: bafb0bd24d7e0e0124318625b239a55d58c757a2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/serial_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index af28d94f1dfc..63eab3af323f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 426929f8d3514d7f727b8c464d1eeeaf74b21519 +refs/heads/master: bafb0bd24d7e0e0124318625b239a55d58c757a2 diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c index 849bd0d06b2c..0464360781fe 100644 --- a/trunk/drivers/tty/serial/serial_core.c +++ b/trunk/drivers/tty/serial/serial_core.c @@ -1253,7 +1253,6 @@ static void uart_close(struct tty_struct *tty, struct file *filp) pr_debug("uart_close(%d) called\n", uport->line); - mutex_lock(&port->mutex); spin_lock_irqsave(&port->lock, flags); if (tty_hung_up_p(filp)) { @@ -1312,6 +1311,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp) uart_wait_until_sent(tty, uport->timeout); } + mutex_lock(&port->mutex); uart_shutdown(tty, state); uart_flush_buffer(tty);