aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/moxa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index ed76f0a127fd..5000b3bd091e 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -1040,14 +1040,14 @@ static void check_xmit_empty(unsigned long data)
1040 struct moxa_port *ch; 1040 struct moxa_port *ch;
1041 1041
1042 ch = (struct moxa_port *) data; 1042 ch = (struct moxa_port *) data;
1043 del_timer_sync(&moxa_ports[ch->port].emptyTimer);
1044 if (ch->tty && (ch->statusflags & EMPTYWAIT)) { 1043 if (ch->tty && (ch->statusflags & EMPTYWAIT)) {
1045 if (MoxaPortTxQueue(ch->port) == 0) { 1044 if (MoxaPortTxQueue(ch->port) == 0) {
1046 ch->statusflags &= ~EMPTYWAIT; 1045 ch->statusflags &= ~EMPTYWAIT;
1047 tty_wakeup(ch->tty); 1046 tty_wakeup(ch->tty);
1048 return; 1047 return;
1049 } 1048 }
1050 mod_timer(&moxa_ports[ch->port].emptyTimer, jiffies + HZ); 1049 mod_timer(&moxa_ports[ch->port].emptyTimer,
1050 round_jiffies(jiffies + HZ));
1051 } else 1051 } else
1052 ch->statusflags &= ~EMPTYWAIT; 1052 ch->statusflags &= ~EMPTYWAIT;
1053} 1053}