From abafb57d36d089134cd5e56e351a54d1e2801fc9 Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sat, 12 Jul 2008 14:51:18 +0200
Subject: [PATCH] --- yaml --- r: 106614 b: refs/heads/master c:
 1e8afea124added6409d5209f90d9949f5a13b32 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/firewire/fw-card.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3873f419a92e..2131d4efd006 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9549bc6803d6a16fe6a85b316b742ef82bd3931
+refs/heads/master: 1e8afea124added6409d5209f90d9949f5a13b32
diff --git a/trunk/drivers/firewire/fw-card.c b/trunk/drivers/firewire/fw-card.c
index da873d795aad..bbd73a406e53 100644
--- a/trunk/drivers/firewire/fw-card.c
+++ b/trunk/drivers/firewire/fw-card.c
@@ -539,7 +539,7 @@ fw_core_remove_card(struct fw_card *card)
 	wait_for_completion(&card->done);
 
 	cancel_delayed_work_sync(&card->work);
-	fw_flush_transactions(card);
+	WARN_ON(!list_empty(&card->transaction_list));
 	del_timer_sync(&card->flush_timer);
 }
 EXPORT_SYMBOL(fw_core_remove_card);