---

yaml --- r: 304219 b: refs/heads/master c: abcefe5 h: refs/heads/master i: 304217: daf1eb3 304215: fecb188 v: v3
git-mirror · May 7, 2012 · 4b99c49 · 4b99c49
1 parent 22a6335
commit 4b99c49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d29f3ef39be4eec0362b985305fc526d9be318cf
+refs/heads/master: abcefe5fc357440bde93f97ba1c72c3b81e2cef5
diff --git a/trunk/drivers/tty/amiserial.c b/trunk/drivers/tty/amiserial.c
@@ -1074,7 +1074,7 @@ static int set_serial_info(struct tty_struct *tty, struct serial_state *state,
 		    (new_serial.xmit_fifo_size != state->xmit_fifo_size) ||
 		    ((new_serial.flags & ~ASYNC_USR_MASK) !=
 		     (port->flags & ~ASYNC_USR_MASK))) {
-			tty_unlock();
+			tty_unlock(tty);
 			return -EPERM;
 		}
 		port->flags = ((port->flags & ~ASYNC_USR_MASK) |