diff options
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/68360serial.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c index 2aa6bfe8fdb3..f59463601874 100644 --- a/drivers/serial/68360serial.c +++ b/drivers/serial/68360serial.c | |||
| @@ -51,6 +51,7 @@ extern int kgdb_output_string (const char* s, unsigned int count); | |||
| 51 | 51 | ||
| 52 | /* #ifdef CONFIG_SERIAL_CONSOLE */ /* This seems to be a post 2.0 thing - mles */ | 52 | /* #ifdef CONFIG_SERIAL_CONSOLE */ /* This seems to be a post 2.0 thing - mles */ |
| 53 | #include <linux/console.h> | 53 | #include <linux/console.h> |
| 54 | #include <linux/jiffies.h> | ||
| 54 | 55 | ||
| 55 | /* this defines the index into rs_table for the port to use | 56 | /* this defines the index into rs_table for the port to use |
| 56 | */ | 57 | */ |
| @@ -1729,7 +1730,7 @@ static void rs_360_wait_until_sent(struct tty_struct *tty, int timeout) | |||
| 1729 | msleep_interruptible(jiffies_to_msecs(char_time)); | 1730 | msleep_interruptible(jiffies_to_msecs(char_time)); |
| 1730 | if (signal_pending(current)) | 1731 | if (signal_pending(current)) |
| 1731 | break; | 1732 | break; |
| 1732 | if (timeout && ((orig_jiffies + timeout) < jiffies)) | 1733 | if (timeout && (time_after(jiffies, orig_jiffies + timeout))) |
| 1733 | break; | 1734 | break; |
| 1734 | /* The 'tx_cur' is really the next buffer to send. We | 1735 | /* The 'tx_cur' is really the next buffer to send. We |
| 1735 | * have to back up to the previous BD and wait for it | 1736 | * have to back up to the previous BD and wait for it |