summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2012-05-07 21:36:06 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-07 16:46:53 -0700
commitabcefe5fc357440bde93f97ba1c72c3b81e2cef5 (patch)
tree392a8dbfe176b77f855efb421fac399e00a39e4d /drivers/tty
parentd29f3ef39be4eec0362b985305fc526d9be318cf (diff)
downloadlinux-3.10-abcefe5fc357440bde93f97ba1c72c3b81e2cef5.tar.gz
linux-3.10-abcefe5fc357440bde93f97ba1c72c3b81e2cef5.tar.bz2
linux-3.10-abcefe5fc357440bde93f97ba1c72c3b81e2cef5.zip
tty/amiserial: Add missing argument for tty_unlock()
commit d29f3ef39be4eec0362b985305fc526d9be318cf ("tty_lock: Localise the lock") missed that d3a7b83f865b46bb7b5e1ed18a129ce1af349db4 ("drivers/tty/amiserial.c: add missing tty_unlock") just added a new caller of tty_unlock(): drivers/tty/amiserial.c: In function ‘set_serial_info’: drivers/tty/amiserial.c:1077: error: too few arguments to function ‘tty_unlock’ Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/amiserial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index b88a65c4924..35819e31262 100644
--- a/drivers/tty/amiserial.c
+++ b/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) |