Date: Tue, 21 Aug 2007 01:05:14 +0200 (CEST) From: Stefan Richter Subject: firewire: fix unloading of fw-ohci while devices are attached Fix panic in run_timer_softirq right after "modprobe -r firewire-ohci" if a FireWire disk was attached and firewire-sbp2 loaded. Same as commit 8a2d9ed3210464d22fccb9834970629c1c36fa36. Signed-off-by: Stefan Richter --- drivers/firewire/fw-card.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Index: linux-2.6.22.10/drivers/firewire/fw-card.c =================================================================== --- linux-2.6.22.10.orig/drivers/firewire/fw-card.c +++ linux-2.6.22.10/drivers/firewire/fw-card.c @@ -507,9 +507,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); }