diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-10-11 00:37:25 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-02 18:44:12 +0300 |
| commit | d9e0dded68a8de6a831dd9c31be32a45f4b67373 (patch) | |
| tree | afa133cff76ea92ea6fd106afa50bcb8ff024731 | |
| parent | 774b4c5215a40f8971ca71470f3832e0ed53a41f (diff) | |
| download | linux-d9e0dded68a8de6a831dd9c31be32a45f4b67373.tar.xz | |
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 <stefanr@s5r6.in-berlin.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/firewire/fw-card.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c index 9eb1edacd825..46d3cf20f682 100644 --- 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); } |