From: Alexandre Oliva <oliva@lsd.ic.unicamp.br>

If you rmmod ohci1394 before the delayed reset runs, the kernel oopses when
it attempts to run delayed_reset_bus() after it was unloaded.

This patch fixes this problem, that occurs very often when Kudzu probes for
firewire controllers.


---

 25-akpm/drivers/ieee1394/hosts.c |    3 +++
 1 files changed, 3 insertions(+)

diff -puN drivers/ieee1394/hosts.c~fix-crash-on-modprobe-ohci1394 drivers/ieee1394/hosts.c
--- 25/drivers/ieee1394/hosts.c~fix-crash-on-modprobe-ohci1394	Wed May 12 15:58:52 2004
+++ 25-akpm/drivers/ieee1394/hosts.c	Wed May 12 15:58:52 2004
@@ -187,6 +187,9 @@ int hpsb_add_host(struct hpsb_host *host
 void hpsb_remove_host(struct hpsb_host *host)
 {
         host->is_shutdown = 1;
+
+	del_timer_sync(&host->delayed_reset);
+
         host->driver = &dummy_driver;
 
         highlevel_remove_host(host);

_