From 73c6a40c299560f0fc3958ce851e75be5742f81a Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 28 Apr 2008 02:14:10 -0700 Subject: [PATCH] --- yaml --- r: 94093 b: refs/heads/master c: d1ec61e6686c3c137aae33a11518b8e629e9c179 h: refs/heads/master i: 94091: 471687f4bb2ec2bd63f601d550cf167adfc3d292 v: v3 --- [refs] | 2 +- trunk/drivers/serial/68360serial.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2d083f9bb1ea..6aa3dcfd2e4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01c194d9278efc15d4785ff205643e9c0bdcef53 +refs/heads/master: d1ec61e6686c3c137aae33a11518b8e629e9c179 diff --git a/trunk/drivers/serial/68360serial.c b/trunk/drivers/serial/68360serial.c index 2aa6bfe8fdb3..f59463601874 100644 --- a/trunk/drivers/serial/68360serial.c +++ b/trunk/drivers/serial/68360serial.c @@ -51,6 +51,7 @@ extern int kgdb_output_string (const char* s, unsigned int count); /* #ifdef CONFIG_SERIAL_CONSOLE */ /* This seems to be a post 2.0 thing - mles */ #include +#include /* this defines the index into rs_table for the port to use */ @@ -1729,7 +1730,7 @@ static void rs_360_wait_until_sent(struct tty_struct *tty, int timeout) msleep_interruptible(jiffies_to_msecs(char_time)); if (signal_pending(current)) break; - if (timeout && ((orig_jiffies + timeout) < jiffies)) + if (timeout && (time_after(jiffies, orig_jiffies + timeout))) break; /* The 'tx_cur' is really the next buffer to send. We * have to back up to the previous BD and wait for it