[PATCH] Fix ia64 simserial.c for Ldisc revamp

[Luck, Tony]

This driver is "hidden" in arch/ia64 ... so it didn't get updated
by the Ldisc revamp.

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


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


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/