From aaf46c541f7c81da2e904d516ba5556113f677b7 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Thu, 18 Oct 2007 03:06:19 -0700
Subject: [PATCH] --- yaml --- r: 71186 b: refs/heads/master c:
 c43422053bea7a5ce09f18d0c50a606fe1a549f4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c38f84670d16..096d8c7687a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc37449f7959aeedc2d38b183468ae73c9166fb6
+refs/heads/master: c43422053bea7a5ce09f18d0c50a606fe1a549f4
diff --git a/trunk/drivers/char/moxa.c b/trunk/drivers/char/moxa.c
index ed76f0a127fd..5000b3bd091e 100644
--- a/trunk/drivers/char/moxa.c
+++ b/trunk/drivers/char/moxa.c
@@ -1040,14 +1040,14 @@ static void check_xmit_empty(unsigned long data)
 	struct moxa_port *ch;
 
 	ch = (struct moxa_port *) data;
-	del_timer_sync(&moxa_ports[ch->port].emptyTimer);
 	if (ch->tty && (ch->statusflags & EMPTYWAIT)) {
 		if (MoxaPortTxQueue(ch->port) == 0) {
 			ch->statusflags &= ~EMPTYWAIT;
 			tty_wakeup(ch->tty);
 			return;
 		}
-		mod_timer(&moxa_ports[ch->port].emptyTimer, jiffies + HZ);
+		mod_timer(&moxa_ports[ch->port].emptyTimer,
+				round_jiffies(jiffies + HZ));
 	} else
 		ch->statusflags &= ~EMPTYWAIT;
 }