aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/n_tty.c
diff options
context:
space:
mode:
authorDima Zavin <dima@android.com>2011-07-07 17:55:44 -0700
committerDima Zavin <dima@android.com>2011-07-07 17:55:44 -0700
commit814cdea670616252e4cdf297a07b02ce59698bf1 (patch)
treec4a5665995e813c252b07f1e863166059bfb5bcb /drivers/tty/n_tty.c
parent487ffb052891a552fecf865ad4b24bbe7945a413 (diff)
parentfe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff)
downloadkernel_samsung_espresso10-814cdea670616252e4cdf297a07b02ce59698bf1.zip
kernel_samsung_espresso10-814cdea670616252e4cdf297a07b02ce59698bf1.tar.gz
kernel_samsung_espresso10-814cdea670616252e4cdf297a07b02ce59698bf1.tar.bz2
Merge commit 'v3.0-rc6' into android-3.0
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 0ad3288..c3954fb 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);