[patch 17/26] firewire: fix unloading of fw-ohci while devices are attached

Greg KH
2007-10-31T15:28:34Z

[-- Attachment #1: firewire-fix-unloading-of-fw-ohci-while-devices-are-attached.patch --]
[-- Type: text/plain, Size: 925 bytes --]

2.6.22-stable review patch. If anyone has any objections, please let us
know.

------------------
From: Stefan Richter <stefanr@s5r6.in-berlin.de>

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 <stefanr@s5r6.in-berlin.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
drivers/firewire/fw-card.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

--- a/drivers/firewire/fw-card.c
+++ b/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);
}

--