Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd11b42e authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Greg Kroah-Hartman
Browse files

cris: fix missing tty arg in wait_event_interruptible_tty call 



Commit d29f3ef3

    "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>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent abcefe5f

drivers/tty/serial/crisv10.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3976,7 +3976,7 @@ block_til_ready(struct tty_struct *tty, struct file * filp, 
	 */

	 */

	if (tty_hung_up_p(filp) ||

	if (tty_hung_up_p(filp) ||

	    (info->flags & ASYNC_CLOSING)) {

	    (info->flags & ASYNC_CLOSING)) {

		wait_event_interruptible_tty(info->close_wait,

		wait_event_interruptible_tty(tty, info->close_wait,

			!(info->flags & ASYNC_CLOSING));

			!(info->flags & ASYNC_CLOSING));

#ifdef SERIAL_DO_RESTART

#ifdef SERIAL_DO_RESTART

		if (info->flags & ASYNC_HUP_NOTIFY)

		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) ||

	if (tty_hung_up_p(filp) ||

	    (info->flags & ASYNC_CLOSING)) {

	    (info->flags & ASYNC_CLOSING)) {

		wait_event_interruptible_tty(info->close_wait,

		wait_event_interruptible_tty(tty, info->close_wait,

			!(info->flags & ASYNC_CLOSING));

			!(info->flags & ASYNC_CLOSING));

#ifdef SERIAL_DO_RESTART

#ifdef SERIAL_DO_RESTART

		return ((info->flags & ASYNC_HUP_NOTIFY) ?

		return ((info->flags & ASYNC_HUP_NOTIFY) ?