lkml.org 
[lkml]   [2008]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
Subject[PATCH] Fix ia64 simserial.c for Ldisc revamp
This driver is "hidden" in arch/ia64 ... so it didn't get updated
by the Ldisc revamp.

Signed-off-by: Tony Luck <tony.luck@intel.com>


diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 23cafc8..f870bbf 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -354,8 +354,8 @@ static void rs_flush_buffer(struct tty_struct *tty)
wake_up_interruptible(&tty->write_wait);

if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
- tty->ldisc.write_wakeup)
- (tty->ldisc.write_wakeup)(tty);
+ tty->ldisc.ops->write_wakeup)
+ (tty->ldisc.ops->write_wakeup)(tty);
}

/*
@@ -407,8 +407,9 @@ static void rs_unthrottle(struct tty_struct * tty)
/*
* rs_break() --- routine which turns the break handling on or off
*/
-static void rs_break(struct tty_struct *tty, int break_state)
+static int rs_break(struct tty_struct *tty, int break_state)
{
+ return 0;
}

static int rs_ioctl(struct tty_struct *tty, struct file * file,
@@ -625,7 +626,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
shutdown(info);
if (tty->ops->flush_buffer)
tty->ops->flush_buffer(tty);
- if (tty->ldisc.flush_buffer) tty->ldisc.flush_buffer(tty);
+ if (tty->ldisc.ops->flush_buffer) tty->ldisc.ops->flush_buffer(tty);
info->event = 0;
info->tty = NULL;
if (info->blocked_open) {



\
 
 \ /
  Last update: 2008-07-10 22:49    [W:0.066 / U:0.920 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site