tty: fix tty_port_block_til_ready waiting
authorJiri Slaby <jirislaby@gmail.com>
Wed, 24 Jun 2009 17:35:05 +0000 (18:35 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Jun 2009 16:55:50 +0000 (09:55 -0700)
Since commit 3e3b5c087799e536871c8261b05bc28e4783c8da ("tty: use
prepare/finish_wait"), tty_port_block_til_ready() is using
prepare_to_wait()/finish_wait().  Those functions require that the
wait_queue_t be initialised with .func=autoremove_wake_function, via
DEFINE_WAIT().

But the conversion from DECLARE_WAITQUEUE() to DEFINE_WAIT() was not made,
so this code will oops in finish_wait().

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/char/tty_port.c

index 62dadfc95e341078ef42a284366cef37dbac6432..4e862a75f7ff213bd62022e852a9d485b65adbbf 100644 (file)
@@ -193,7 +193,7 @@ int tty_port_block_til_ready(struct tty_port *port,
 {
        int do_clocal = 0, retval;
        unsigned long flags;
-       DECLARE_WAITQUEUE(wait, current);
+       DEFINE_WAIT(wait);
        int cd;
 
        /* block if port is in the process of being closed */