From c1e0e6fb8ea51b1ecb7517586e21751159056d67 Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Thu, 19 Apr 2012 18:12:40 +0200
Subject: [PATCH] --- yaml --- r: 299443 b: refs/heads/master c:
 d3a7b83f865b46bb7b5e1ed18a129ce1af349db4 h: refs/heads/master i:   299441:
 988f26bc0a4bda8520c96e57df32c0c523a26bfd   299439:
 3241e220df77cddce0abd3dd96aa2417b648509b v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/tty/amiserial.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b969348302d4..cb89e3917008 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af6d17cdc8c89aeb3101f0d27cd32fc0592b40b2
+refs/heads/master: d3a7b83f865b46bb7b5e1ed18a129ce1af349db4
diff --git a/trunk/drivers/tty/amiserial.c b/trunk/drivers/tty/amiserial.c
index 24145c30c9b0..6cc4358f68c1 100644
--- a/trunk/drivers/tty/amiserial.c
+++ b/trunk/drivers/tty/amiserial.c
@@ -1073,8 +1073,10 @@ static int set_serial_info(struct tty_struct *tty, struct serial_state *state,
 		    (new_serial.close_delay != port->close_delay) ||
 		    (new_serial.xmit_fifo_size != state->xmit_fifo_size) ||
 		    ((new_serial.flags & ~ASYNC_USR_MASK) !=
-		     (port->flags & ~ASYNC_USR_MASK)))
+		     (port->flags & ~ASYNC_USR_MASK))) {
+			tty_unlock();
 			return -EPERM;
+		}
 		port->flags = ((port->flags & ~ASYNC_USR_MASK) |
 			       (new_serial.flags & ASYNC_USR_MASK));
 		state->custom_divisor = new_serial.custom_divisor;