patch-2.4.0-test5 linux/drivers/scsi/pluto.c

• Lines: 33
• Date: Fri Jul 14 12:20:22 2000
• Orig file: v2.4.0-test4/linux/drivers/scsi/pluto.c
• Orig date: Thu May 11 15:30:07 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/scsi/pluto.c linux/drivers/scsi/pluto.c
@@ -48,7 +48,6 @@
 } *fcs __initdata = { 0 };
 static int fcscount __initdata = 0;
 static atomic_t fcss __initdata = ATOMIC_INIT(0);
-static struct timer_list fc_timer __initdata = { function: NULL };
 DECLARE_MUTEX_LOCKED(fc_sem);
 
 static int pluto_encode_addr(Scsi_Cmnd *SCpnt, u16 *addr, fc_channel *fc, fcp_cmnd *fcmd);
@@ -92,6 +91,7 @@
 	int i, retry, nplutos;
 	fc_channel *fc;
 	Scsi_Device dev;
+	struct timer_list fc_timer = { function: pluto_detect_timeout };
 
 	tpnt->proc_name = "pluto";
 	fcscount = 0;
@@ -121,7 +121,6 @@
 	memset (fcs, 0, sizeof (struct ctrl_inquiry) * fcscount);
 	memset (&dev, 0, sizeof(dev));
 	atomic_set (&fcss, fcscount);
-	fc_timer.function = pluto_detect_timeout;
 	
 	i = 0;
 	for_each_online_fc_channel(fc) {
@@ -192,7 +191,7 @@
 		if (!atomic_read(&fcss))
 			break; /* All fc channels have answered us */
 	}
-	del_timer(&fc_timer);
+	del_timer_sync(&fc_timer);
 
 	PLND(("Finished search\n"))
 	for (i = 0, nplutos = 0; i < fcscount; i++) {