diff options
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/hosts.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c index c502c6e9c440..aeeaeb670d03 100644 --- a/drivers/ieee1394/hosts.c +++ b/drivers/ieee1394/hosts.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
| 19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 20 | #include <linux/timer.h> | 20 | #include <linux/timer.h> |
| 21 | #include <linux/jiffies.h> | ||
| 21 | 22 | ||
| 22 | #include "csr1212.h" | 23 | #include "csr1212.h" |
| 23 | #include "ieee1394.h" | 24 | #include "ieee1394.h" |
| @@ -217,7 +218,7 @@ int hpsb_update_config_rom_image(struct hpsb_host *host) | |||
| 217 | 218 | ||
| 218 | /* IEEE 1394a-2000 prohibits using the same generation number | 219 | /* IEEE 1394a-2000 prohibits using the same generation number |
| 219 | * twice in a 60 second period. */ | 220 | * twice in a 60 second period. */ |
| 220 | if (jiffies - host->csr.gen_timestamp[next_gen] < 60 * HZ) | 221 | if (time_before(jiffies, host->csr.gen_timestamp[next_gen] + 60 * HZ)) |
| 221 | /* Wait 60 seconds from the last time this generation number was | 222 | /* Wait 60 seconds from the last time this generation number was |
| 222 | * used. */ | 223 | * used. */ |
| 223 | reset_delay = (60 * HZ) + host->csr.gen_timestamp[next_gen] - jiffies; | 224 | reset_delay = (60 * HZ) + host->csr.gen_timestamp[next_gen] - jiffies; |