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>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
index 24ff35511e2b..3241dc4e1fc9 100644
--- a/drivers/firewire/core-card.c
+++ b/drivers/firewire/core-card.c
@@ -233,7 +233,7 @@ static void br_work(struct work_struct *work)
 
         /* Delay for 2s after last reset per IEEE 1394 clause 8.2.1. */
         if (card->reset_jiffies != 0 &&
-            time_is_after_jiffies(card->reset_jiffies + 2 * HZ)) {
+            time_before64(get_jiffies_64(), card->reset_jiffies + 2 * HZ)) {
                 if (!schedule_delayed_work(&card->br_work, 2 * HZ))
                         fw_card_put(card);
                 return;
@@ -316,7 +316,8 @@ static void bm_work(struct work_struct *work)
         irm_id   = card->irm_node->node_id;
         local_id = card->local_node->node_id;
 
-        grace = time_after(jiffies, card->reset_jiffies + DIV_ROUND_UP(HZ, 8));
+        grace = time_after64(get_jiffies_64(),
+                             card->reset_jiffies + DIV_ROUND_UP(HZ, 8));
 
         if ((is_next_generation(generation, card->bm_generation) &&
              !card->bm_abdicate) ||