From e3cdc93e659c2d7657be454cd0b410f302ac7e5a Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Mon, 30 Nov 2009 13:18:18 +0000
Subject: [PATCH] --- yaml --- r: 175359 b: refs/heads/master c:
 f710ebd7f70801e31751f2c49fe4b92a477d24eb h: refs/heads/master i:   175357:
 6eff78fd4a5a8b2abb42db3ec8d861decbc00383   175355:
 2a6aa7764d38148e12999613513f150d23bf1916   175351:
 46496ddb5f3f4309aeabe59c93d7fa23d011dfd1   175343:
 8f53eb30f2b25aac13f6cbc7e4b227b8dad12c3f   175327:
 bbb20165e8852aaf8c549cb0b0f8e32cf8506548   175295:
 9f4303b5d456fd34ec8ecb80102530fe1471890a   175231:
 c8826b7d9bd0306332078e02b4aa2a8d80158fb9   175103:
 9165d4927b85f89e89f7f637406a52da69670a90 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/char/moxa.c | 16 ++--------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 919fe675828f..b5033965759c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8482bcd58530ad5857d7187854132f2b846db681
+refs/heads/master: f710ebd7f70801e31751f2c49fe4b92a477d24eb
diff --git a/trunk/drivers/char/moxa.c b/trunk/drivers/char/moxa.c
index ac06d0131db5..d53fac5229bf 100644
--- a/trunk/drivers/char/moxa.c
+++ b/trunk/drivers/char/moxa.c
@@ -34,7 +34,6 @@
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/major.h>
-#include <linux/smp_lock.h>
 #include <linux/string.h>
 #include <linux/fcntl.h>
 #include <linux/ptrace.h>
@@ -202,7 +201,6 @@ static int moxa_tiocmset(struct tty_struct *tty, struct file *file,
 			 unsigned int set, unsigned int clear);
 static void moxa_poll(unsigned long);
 static void moxa_set_tty_param(struct tty_struct *, struct ktermios *);
-static void moxa_setup_empty_event(struct tty_struct *);
 static void moxa_shutdown(struct tty_port *);
 static int moxa_carrier_raised(struct tty_port *);
 static void moxa_dtr_rts(struct tty_port *, int);
@@ -1251,17 +1249,13 @@ static int moxa_chars_in_buffer(struct tty_struct *tty)
 	struct moxa_port *ch = tty->driver_data;
 	int chars;
 
-	lock_kernel();
 	chars = MoxaPortTxQueue(ch);
-	if (chars) {
+	if (chars)
 		/*
 		 * Make it possible to wakeup anything waiting for output
 		 * in tty_ioctl.c, etc.
 		 */
-		if (!test_bit(EMPTYWAIT, &ch->statusflags))
-			moxa_setup_empty_event(tty);
-	}
-	unlock_kernel();
+        	set_bit(EMPTYWAIT, &ch->statusflags);
 	return chars;
 }
 
@@ -1503,12 +1497,6 @@ static void moxa_set_tty_param(struct tty_struct *tty, struct ktermios *old_term
 	tty_encode_baud_rate(tty, baud, baud);
 }
 
-static void moxa_setup_empty_event(struct tty_struct *tty)
-{
-	struct moxa_port *ch = tty->driver_data;
-	set_bit(EMPTYWAIT, &ch->statusflags);
-}
-
 /*****************************************************************************
  *	Driver level functions: 					     *
  *****************************************************************************/