aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2011-01-22 09:05:03 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2011-01-23 06:31:01 -0500
commite71084af58cf15e6043338500eeaf6281d0a62af (patch)
treed757d4891a4f93f7a07c1f12448d3be3be748fa1 /include/linux
parentdbc9880fa731fe2482a706bbabb4165269233063 (diff)
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')
-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 9a3f5f9383f6..b6d21d5a11a2 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -89,7 +89,7 @@ struct fw_card {
89 int current_tlabel; 89 int current_tlabel;
90 u64 tlabel_mask; 90 u64 tlabel_mask;
91 struct list_head transaction_list; 91 struct list_head transaction_list;
92 unsigned long reset_jiffies; 92 u64 reset_jiffies;
93 93
94 u32 split_timeout_hi; 94 u32 split_timeout_hi;
95 u32 split_timeout_lo; 95 u32 split_timeout_lo;