From 4b99c49c79205f7a1a45ebeb53171891a865be90 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 7 May 2012 21:36:06 +0200 Subject: [PATCH] --- yaml --- r: 304219 b: refs/heads/master c: abcefe5fc357440bde93f97ba1c72c3b81e2cef5 h: refs/heads/master i: 304217: daf1eb3fc2e4c7be9f722500687ac4c8062d614d 304215: fecb188926a9c658b480d6194d961bbd820a3054 v: v3 --- [refs] | 2 +- trunk/drivers/tty/amiserial.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1a52df5fa968..f17946489a96 100644 --- 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 index b88a65c49240..35819e312624 100644 --- 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) |