From 207a6301a2163f3099ba544a81770a4131321aa0 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Tue, 8 May 2012 11:17:55 -0400 Subject: [PATCH] --- yaml --- r: 304220 b: refs/heads/master c: fd11b42e3598779cb25feaefb1d534a39fc35009 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/crisv10.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f17946489a96..fe6ed7f2ed79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abcefe5fc357440bde93f97ba1c72c3b81e2cef5 +refs/heads/master: fd11b42e3598779cb25feaefb1d534a39fc35009 diff --git a/trunk/drivers/tty/serial/crisv10.c b/trunk/drivers/tty/serial/crisv10.c index b431a5164f45..7264d4d26717 100644 --- a/trunk/drivers/tty/serial/crisv10.c +++ b/trunk/drivers/tty/serial/crisv10.c @@ -3976,7 +3976,7 @@ block_til_ready(struct tty_struct *tty, struct file * filp, */ if (tty_hung_up_p(filp) || (info->flags & ASYNC_CLOSING)) { - wait_event_interruptible_tty(info->close_wait, + wait_event_interruptible_tty(tty, info->close_wait, !(info->flags & ASYNC_CLOSING)); #ifdef SERIAL_DO_RESTART if (info->flags & ASYNC_HUP_NOTIFY) @@ -4115,7 +4115,7 @@ rs_open(struct tty_struct *tty, struct file * filp) */ if (tty_hung_up_p(filp) || (info->flags & ASYNC_CLOSING)) { - wait_event_interruptible_tty(info->close_wait, + wait_event_interruptible_tty(tty, info->close_wait, !(info->flags & ASYNC_CLOSING)); #ifdef SERIAL_DO_RESTART return ((info->flags & ASYNC_HUP_NOTIFY) ?