X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fieee1394%2Fhosts.c;h=47a6141cbc845f92eee80c38e4589c7124f40e2b;hb=746550cff061581f89c687ada8523670768364f2;hp=b205d80cd0f3bc3defb5282de3af2c5fb053cd71;hpb=86090fcac5e27b630656fe3d963a6b80e26dac44;p=linux-2.6.git

diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
index b205d80cd..47a6141cb 100644
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
@@ -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);