aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/n_tty.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-07-05 23:23:37 -0700
committerDavid S. Miller <davem@davemloft.net>2011-07-05 23:23:37 -0700
commite12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4 (patch)
tree83c0e192ccaa4752c80b6131a7d0aa8272b5d0d0 /drivers/tty/n_tty.c
parentb44: Use pr_<level>_once and DRV_DESCRIPTION (diff)
parentnet: vlan: enable soft features regardless of underlying device (diff)
downloadlinux-dev-e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4.tar.xz
linux-dev-e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/tty/n_tty.c')
-rw-r--r--drivers/tty/n_tty.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 0ad32888091c..c3954fbf6ac4 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1815,6 +1815,7 @@ do_it_again:
/* FIXME: does n_tty_set_room need locking ? */
n_tty_set_room(tty);
timeout = schedule_timeout(timeout);
+ BUG_ON(!tty->read_buf);
continue;
}
__set_current_state(TASK_RUNNING);