diff options
Diffstat (limited to 'drivers/scsi/osst.c')
| -rw-r--r-- | drivers/scsi/osst.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index 66ea47a9c53c..e3bd4bc339f4 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c | |||
| @@ -49,6 +49,7 @@ static const char * osst_version = "0.99.4"; | |||
| 49 | #include <linux/blkdev.h> | 49 | #include <linux/blkdev.h> |
| 50 | #include <linux/moduleparam.h> | 50 | #include <linux/moduleparam.h> |
| 51 | #include <linux/delay.h> | 51 | #include <linux/delay.h> |
| 52 | #include <linux/jiffies.h> | ||
| 52 | #include <asm/uaccess.h> | 53 | #include <asm/uaccess.h> |
| 53 | #include <asm/dma.h> | 54 | #include <asm/dma.h> |
| 54 | #include <asm/system.h> | 55 | #include <asm/system.h> |
| @@ -856,7 +857,7 @@ static int osst_wait_frame(struct osst_tape * STp, struct osst_request ** aSRpnt | |||
| 856 | ) && result >= 0) | 857 | ) && result >= 0) |
| 857 | { | 858 | { |
| 858 | #if DEBUG | 859 | #if DEBUG |
| 859 | if (debugging || jiffies - startwait >= 2*HZ/OSST_POLL_PER_SEC) | 860 | if (debugging || time_after_eq(jiffies, startwait + 2*HZ/OSST_POLL_PER_SEC)) |
| 860 | printk (OSST_DEB_MSG | 861 | printk (OSST_DEB_MSG |
| 861 | "%s:D: Succ wait f fr %i (>%i): %i-%i %i (%i): %3li.%li s\n", | 862 | "%s:D: Succ wait f fr %i (>%i): %i-%i %i (%i): %3li.%li s\n", |
| 862 | name, curr, curr+minlast, STp->first_frame_position, | 863 | name, curr, curr+minlast, STp->first_frame_position, |
| @@ -867,7 +868,7 @@ static int osst_wait_frame(struct osst_tape * STp, struct osst_request ** aSRpnt | |||
| 867 | return 0; | 868 | return 0; |
| 868 | } | 869 | } |
| 869 | #if DEBUG | 870 | #if DEBUG |
| 870 | if (jiffies - startwait >= 2*HZ/OSST_POLL_PER_SEC && notyetprinted) | 871 | if (time_after_eq(jiffies, startwait + 2*HZ/OSST_POLL_PER_SEC) && notyetprinted) |
| 871 | { | 872 | { |
| 872 | printk (OSST_DEB_MSG "%s:D: Wait for frame %i (>%i): %i-%i %i (%i)\n", | 873 | printk (OSST_DEB_MSG "%s:D: Wait for frame %i (>%i): %i-%i %i (%i)\n", |
| 873 | name, curr, curr+minlast, STp->first_frame_position, | 874 | name, curr, curr+minlast, STp->first_frame_position, |
