Merge branch 'linus' into x86/i8259

[linux-2.6] / drivers / net / ppp_synctty.c

diff --git a/drivers/net/ppp_synctty.c b/drivers/net/ppp_synctty.c
index 48ed5fdbfe18602ef0f78e497302c24d3003b885..b8f0369a71e777a30b8a52897184a6cca3a2cb4a 100644 (file)
--- a/drivers/net/ppp_synctty.c
+++ b/drivers/net/ppp_synctty.c
@@ -401,9 +401,7 @@ ppp_sync_receive(struct tty_struct *tty, const unsigned char *buf,
        if (!skb_queue_empty(&ap->rqueue))
                tasklet_schedule(&ap->tsk);
        sp_put(ap);
-       if (test_and_clear_bit(TTY_THROTTLED, &tty->flags)
-           && tty->ops->unthrottle)
-               tty->ops->unthrottle(tty);
+       tty_unthrottle(tty);
 }
 
 static void