[PATCH] scsi_reset_provider() in scsi_error.c lk2.5.52

[PATCH] scsi_reset_provider() in scsi_error.c lk2.5.52

[Douglas Gilbert]

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

While testing Willem's last ide-scsi "rev1" patch
with sg_reset I found that scsi_reset_provider()
attempts to delete a timer that has not been set.

A crude patch is attached that stops the kernel noise.
Hopefully James can improve on it.

Doug Gilbert

[-- Attachment #2: scsi_error_2552_reset.diff --]
[-- Type: text/plain, Size: 426 bytes --]

--- linux/drivers/scsi/scsi_error.c	2002-12-22 16:19:53.000000000 +1100
+++ linux/drivers/scsi/scsi_error.c2552res	2002-12-24 10:16:32.000000000 +1100
@@ -1811,6 +1811,10 @@
 	 */
 	SCpnt->pid			= 0;
 
+	/* Code expects a timer to be set, so set one for 120 seconds */
+	init_timer(&SCpnt->eh_timeout);
+	scsi_add_timer(SCpnt, 120 * HZ, scsi_eh_times_out);
+
 	rtn = scsi_new_reset(SCpnt, flag);
 
 	scsi_delete_timer(SCpnt);