1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
index d0f15c2f1e1d..7c4cf6cfa746 100644
--- a/drivers/firewire/core-card.c
+++ b/drivers/firewire/core-card.c
@@ -260,7 +260,8 @@ static void fw_card_bm_work(struct work_struct *work)
 
         grace = time_after(jiffies, card->reset_jiffies + DIV_ROUND_UP(HZ, 8));
 
-        if (is_next_generation(generation, card->bm_generation) ||
+        if ((is_next_generation(generation, card->bm_generation) &&
+             !card->bm_abdicate) ||
             (card->bm_generation != generation && grace)) {
                 /*
                  * This first step is to figure out who is IRM and