fix build error in tty patch

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 9ac57687a6a8ad574a703ce3e9d8cb691a0e8495..eaedf193a7dc29bb340d82dd35c9402cf97f7d12 100644 (file)
--- 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 <gregkh@suse.de>
                        /* 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 <gregkh@suse.de>
        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 <gregkh@suse.de>
  /* 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)