From bdd6248729d1f4a75e4623bce4f9c7737753b712 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 1 Jul 2008 09:44:04 -0700 Subject: [PATCH] fix build error in tty patch --- .../tty-fix-for-tty-operations-bugs.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/review-2.6.25/tty-fix-for-tty-operations-bugs.patch b/review-2.6.25/tty-fix-for-tty-operations-bugs.patch index 9ac57687a6a..eaedf193a7d 100644 --- a/review-2.6.25/tty-fix-for-tty-operations-bugs.patch +++ b/review-2.6.25/tty-fix-for-tty-operations-bugs.patch @@ -50,13 +50,13 @@ Signed-off-by: Greg Kroah-Hartman /* 20 sec timeout not reached */ return 1; } -+ if (ax->tty->drivers->chars_in_buffer) -+ cib = ax->tty->chars_in_buffer(ax->tty); ++ if (ax->tty->driver->chars_in_buffer) ++ cib = ax->tty->driver->chars_in_buffer(ax->tty); printk(KERN_ERR "mkiss: %s: transmit timed out, %s?\n", dev->name, - (ax->tty->driver->chars_in_buffer(ax->tty) || ax->xleft) ? - "bad line quality" : "driver error"); -+ cib || ax->xleft) ? "bad line quality" : "driver error"); ++ cib || ax->xleft ? "bad line quality" : "driver error"); ax->xleft = 0; clear_bit(TTY_DO_WRITE_WAKEUP, &ax->tty->flags); @@ -76,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return -1;); - return priv->tty->driver->chars_in_buffer(priv->tty); -+ if (priv->tty->drivers->chars_in_buffer) ++ if (priv->tty->driver->chars_in_buffer) + return priv->tty->driver->chars_in_buffer(priv->tty); + return 0; } @@ -84,16 +84,16 @@ Signed-off-by: Greg Kroah-Hartman /* Wait (sleep) until underlaying hardware finished transmission --- a/drivers/net/ppp_async.c +++ b/drivers/net/ppp_async.c -@@ -157,6 +157,9 @@ ppp_asynctty_open(struct tty_struct *tty - { +@@ -158,6 +158,9 @@ ppp_asynctty_open(struct tty_struct *tty struct asyncppp *ap; int err; -+ + + if (!tty->driver->write) + return -EOPNOTSUPP; - ++ err = -ENOMEM; ap = kzalloc(sizeof(*ap), GFP_KERNEL); + if (!ap) --- a/drivers/net/ppp_synctty.c +++ b/drivers/net/ppp_synctty.c @@ -207,6 +207,9 @@ ppp_sync_open(struct tty_struct *tty) -- 2.47.3