X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fserial%2Fjsm%2Fjsm_tty.c;h=7d823705193cfd55cebe2323b95d8edbf5d44c62;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=f8262e6ad8d3c3fc9728e621248c2d54f70bf2e5;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c
index f8262e6ad..7d8237051 100644
--- a/drivers/serial/jsm/jsm_tty.c
+++ b/drivers/serial/jsm/jsm_tty.c
@@ -588,6 +588,13 @@ void jsm_input(struct jsm_channel *ch)
 	len = min(len, (N_TTY_BUF_SIZE - 1) - tp->read_cnt);
 	ld = tty_ldisc_ref(tp);
 
+	/*
+	 * If the DONT_FLIP flag is on, don't flush our buffer, and act
+	 * like the ld doesn't have any space to put the data right now.
+	 */
+	if (test_bit(TTY_DONT_FLIP, &tp->flags))
+		len = 0;
+
 	/*
 	 * If we were unable to get a reference to the ld,
 	 * don't flush our buffer, and act like the ld doesn't