1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 0aeab3218bb6..3e9719948a8e 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -510,9 +510,11 @@ fw_core_remove_card(struct fw_card *card)
         /* Set up the dummy driver. */
         card->driver = &dummy_driver;
 
-        fw_flush_transactions(card);
-
         fw_destroy_nodes(card);
+        flush_scheduled_work();
+
+        fw_flush_transactions(card);
+        del_timer_sync(&card->flush_timer);
 
         fw_card_put(card);
 }