patch-1.3.78 linux/drivers/scsi/scsi.c

• Lines: 19
• Date: Sat Mar 23 13:15:00 1996
• Orig file: v1.3.77/linux/drivers/scsi/scsi.c
• Orig date: Wed Mar 20 10:59:57 1996

diff -u --recursive --new-file v1.3.77/linux/drivers/scsi/scsi.c linux/drivers/scsi/scsi.c
@@ -2153,7 +2153,7 @@
     
     if(SCset){
 	oldto = SCset->timeout - used;
-	SCset->timeout = timeout + used;
+	SCset->timeout = timeout;
     }
 
     least = 0xffffffff;
@@ -2161,7 +2161,8 @@
     for(host = scsi_hostlist; host; host = host->next)
 	for(SCpnt = host->host_queue; SCpnt; SCpnt = SCpnt->next)
 	    if (SCpnt->timeout > 0) {
-		SCpnt->timeout -= used;
+	        if (SCpnt != SCset)
+		  SCpnt->timeout -= used;
 		if(SCpnt->timeout <= 0) SCpnt->timeout = -1;
 		if(SCpnt->timeout > 0 && SCpnt->timeout < least)
 		    least = SCpnt->timeout;