patch-2.3.38 linux/drivers/scsi/scsi_error.c

• Lines: 21
• Date: Fri Jan 7 11:55:28 2000
• Orig file: v2.3.37/linux/drivers/scsi/scsi_error.c
• Orig date: Wed Dec 29 13:13:19 1999

diff -u --recursive --new-file v2.3.37/linux/drivers/scsi/scsi_error.c linux/drivers/scsi/scsi_error.c
@@ -150,7 +150,7 @@
 
 	rtn = del_timer(&SCset->eh_timeout);
 
-	SCSI_LOG_ERROR_RECOVERY(5, printk("Clearing timer for command %p\n", SCset));
+	SCSI_LOG_ERROR_RECOVERY(5, printk("Clearing timer for command %p %d\n", SCset, rtn));
 
 	SCset->eh_timeout.data = (unsigned long) NULL;
 	SCset->eh_timeout.function = NULL;
@@ -1057,7 +1057,10 @@
 	if ((++SCpnt->retries) < SCpnt->allowed) {
 		return NEEDS_RETRY;
 	} else {
-		return FAILED;
+                /*
+                 * No more retries - report this one back to upper level.
+                 */
+		return SUCCESS;
 	}
 }