Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / drivers / tty / synclink_gt.c

diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 45b43f1..aa1debf 100644 (file)
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -3336,9 +3336,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                }
 
                DBGINFO(("%s block_til_ready wait\n", tty->driver->name));
-               tty_unlock(tty);
+               tty_unlock();
                schedule();
-               tty_lock(tty);
+               tty_lock();
        }
 
        set_current_state(TASK_RUNNING);