From 1c5e851227f56e26aa9851f618124b3d31095707 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Tue, 21 Aug 2007 01:05:14 +0200 Subject: [PATCH] --- yaml --- r: 64443 b: refs/heads/master c: 8a2d9ed3210464d22fccb9834970629c1c36fa36 h: refs/heads/master i: 64441: 2539c20f473ed5b85c46bbac80220f2f36aadd98 64439: 820f029b7e4bbf89b9e0af79c0f4d711ed651670 v: v3 --- [refs] | 2 +- trunk/drivers/firewire/fw-card.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1df2c3bec4b2..3f063e19dad5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2ee3f9bbb0ce57102dad8928d54f59acdc4b8f7 +refs/heads/master: 8a2d9ed3210464d22fccb9834970629c1c36fa36 diff --git a/trunk/drivers/firewire/fw-card.c b/trunk/drivers/firewire/fw-card.c index 0aeab3218bb6..3e9719948a8e 100644 --- a/trunk/drivers/firewire/fw-card.c +++ b/trunk/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); }