From 070bae30fe9fc5f6cac20cf506e2ad280078629a Mon Sep 17 00:00:00 2001
From: Paul Fulghum <paulkf@microgate.com>
Date: Tue, 22 Jul 2008 11:21:19 +0100
Subject: [PATCH] --- yaml --- r: 104703 b: refs/heads/master c:
 c72f527c104cae8e767e714574238b5550879e0c h: refs/heads/master i:   104701:
 7c30813de1727be5e5613de74d8f81807a0f3ccd   104699:
 adcdc4a6c9ec753b3b890b07e90f4438e5beb11e   104695:
 de2f8aeb391ff567aab612b5b9c4ebe21d8bff99   104687:
 1d2897d75e8c3580a2cb907d05dffdb9a10d4e8c   104671:
 8534cf064a237e4cb16e803afa36d3850dd96eb4   104639:
 aff9fba53a221454c9934b9eb7a46073b3f57b47   104575:
 9f2f3e4994872c829f1713c4d5e0cf9292d18abd   104447:
 36ecbd682292842230ecb63974d9cd4cffc150ab v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/char/n_hdlc.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0103ea452c99..b25766daf034 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 768aec0b5bccbd460bcf6e9131f19b5a26f3862d
+refs/heads/master: c72f527c104cae8e767e714574238b5550879e0c
diff --git a/trunk/drivers/char/n_hdlc.c b/trunk/drivers/char/n_hdlc.c
index ed4e03333ab4..69ec6399c714 100644
--- a/trunk/drivers/char/n_hdlc.c
+++ b/trunk/drivers/char/n_hdlc.c
@@ -677,6 +677,10 @@ static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,
 	/* Allocate transmit buffer */
 	/* sleep until transmit buffer available */		
 	while (!(tbuf = n_hdlc_buf_get(&n_hdlc->tx_free_buf_list))) {
+		if (file->f_flags & O_NONBLOCK) {
+			error = -EAGAIN;
+			break;
+		}
 		schedule();
 			
 		n_hdlc = tty2n_hdlc (tty);