diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-08-25 10:04:27 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-08-25 10:04:32 +0200 |
commit | daedc71836e5a398fd0cc0e12c5cb43539478485 (patch) | |
tree | c56567a92017679e57195cef992d4a5561c20e0e /drivers/net/ppp_synctty.c | |
parent | irq: Remove superfluous NULL pointer check in check_irq_resend() (diff) | |
parent | Linux 2.6.31-rc7 (diff) | |
download | linux-daedc71836e5a398fd0cc0e12c5cb43539478485.tar.xz linux-daedc71836e5a398fd0cc0e12c5cb43539478485.zip |
Merge commit 'v2.6.31-rc7' into irq/core
Merge reason: move from an -rc2 base to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/ppp_synctty.c')
-rw-r--r-- | drivers/net/ppp_synctty.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ppp_synctty.c b/drivers/net/ppp_synctty.c index aa3d39f38e22..d2fa2db13586 100644 --- a/drivers/net/ppp_synctty.c +++ b/drivers/net/ppp_synctty.c @@ -397,6 +397,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); + tty_unthrottle(tty); } static void |