* [PATCH] cris: fix missing tty arg in wait_event_interruptible_tty call
@ 2012-05-08 15:17 Paul Gortmaker
0 siblings, 0 replies; only message in thread
From: Paul Gortmaker @ 2012-05-08 15:17 UTC (permalink / raw)
To: linux-serial
Cc: linux-cris-kernel, Paul Gortmaker, Mikael Starvik, Jesper Nilsson,
Alan Cox, Arnd Bergmann, Greg Kroah-Hartman
Commit d29f3ef39be4eec0362b985305fc526d9be318cf
"tty_lock: Localise the lock"
added a tty arg to wait_event_interruptible_tty() but it missed
this arch specific instance for cris, causing a compile failure.
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index b431a51..7264d4d 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/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) ?
--
1.7.9.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-05-08 15:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-08 15:17 [PATCH] cris: fix missing tty arg in wait_event_interruptible_tty call Paul Gortmaker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).