summaryrefslogtreecommitdiff
path: root/include/linux/firewire.h
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2011-01-22 15:05:03 +0100
committerStefan Richter <stefanr@s5r6.in-berlin.de>2011-01-23 12:31:01 +0100
commite71084af58cf15e6043338500eeaf6281d0a62af (patch)
treed757d4891a4f93f7a07c1f12448d3be3be748fa1 /include/linux/firewire.h
parentdbc9880fa731fe2482a706bbabb4165269233063 (diff)
downloadlinux-3.10-e71084af58cf15e6043338500eeaf6281d0a62af.tar.gz
linux-3.10-e71084af58cf15e6043338500eeaf6281d0a62af.tar.bz2
linux-3.10-e71084af58cf15e6043338500eeaf6281d0a62af.zip
firewire: core: fix card->reset_jiffies overflow
On a 32-bit machine with, e.g., HZ=1000, jiffies will overflow after about 50 days, so if there are between 25 and 50 days between bus resets, the card->reset_jiffies comparisons can get wrong results. To fix this, ensure that this timestamp always uses 64 bits. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: "Stefan Richter" <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'include/linux/firewire.h')
-rw-r--r--include/linux/firewire.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 9a3f5f9383f..b6d21d5a11a 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -89,7 +89,7 @@ struct fw_card {
int current_tlabel;
u64 tlabel_mask;
struct list_head transaction_list;
- unsigned long reset_jiffies;
+ u64 reset_jiffies;
u32 split_timeout_hi;
u32 split_timeout_lo;