From 95c9f1068c13fe5232a093fd94b32cb83f6cdc85 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 29 Aug 2011 15:43:36 +0900 Subject: [PATCH] --- yaml --- r: 267331 b: refs/heads/master c: 55956216f4b42fefaee70060b054359d63d2afa5 h: refs/heads/master i: 267329: 5ff6a5653afcdd570e9cec88145fd001d907ae57 267327: 5dca7733725c5aac7b965f195dbd42f6ec2db580 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/serial_core.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f986c47fb4d1..0c78aa1a4fcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e44aabd649c80e8be16ede3ed3cbff6fb2561ca9 +refs/heads/master: 55956216f4b42fefaee70060b054359d63d2afa5 diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c index 1d3780cc3b70..a32dc4362224 100644 --- a/trunk/drivers/tty/serial/serial_core.c +++ b/trunk/drivers/tty/serial/serial_core.c @@ -1257,7 +1257,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp) if (tty_hung_up_p(filp)) { spin_unlock_irqrestore(&port->lock, flags); - goto done; + return; } if ((tty->count == 1) && (port->count != 1)) { @@ -1279,7 +1279,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp) } if (port->count) { spin_unlock_irqrestore(&port->lock, flags); - goto done; + return; } /* @@ -1342,7 +1342,6 @@ static void uart_close(struct tty_struct *tty, struct file *filp) wake_up_interruptible(&port->open_wait); wake_up_interruptible(&port->close_wait); -done: mutex_unlock(&port->mutex); }