patch-2.2.18 linux/drivers/scsi/aha1542.c

• Lines: 51
• Date: Wed Nov 22 16:36:11 2000
• Orig file: v2.2.17/drivers/scsi/aha1542.c
• Orig date: Fri Apr 21 12:46:27 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/scsi/aha1542.c linux/drivers/scsi/aha1542.c
@@ -1264,6 +1264,7 @@
 	    if (SCtmp->host_scribble) 
 	    {
 		scsi_free(SCtmp->host_scribble, 512);
+	      	SCtmp->host_scribble = 0;
 	    }
 	    
 	    HOSTDATA(SCpnt->host)->SCint[i] = NULL;
@@ -1330,6 +1331,7 @@
 	    if (SCtmp->host_scribble) 
 	    {
 		scsi_free(SCtmp->host_scribble, 512);
+	      	SCtmp->host_scribble = 0;
 	    }
 	    
 	    HOSTDATA(SCpnt->host)->SCint[i] = NULL;
@@ -1402,6 +1404,7 @@
 	    if (SCtmp->host_scribble) 
 	    {
 		scsi_free(SCtmp->host_scribble, 512);
+	      	SCtmp->host_scribble = 0;
 	    }
 	    
 	    HOSTDATA(SCpnt->host)->SCint[i] = NULL;
@@ -1540,7 +1543,11 @@
 	      Scsi_Cmnd * SCtmp;
 	      SCtmp = HOSTDATA(SCpnt->host)->SCint[i];
 	      SCtmp->result = DID_RESET << 16;
-	      if (SCtmp->host_scribble) scsi_free(SCtmp->host_scribble, 512);
+	      if (SCtmp->host_scribble)
+	      {
+	      	scsi_free(SCtmp->host_scribble, 512);
+	      	SCtmp->host_scribble = 0;
+	      }
 	      printk("Sending DID_RESET for target %d\n", SCpnt->target);
 	      SCtmp->scsi_done(SCpnt);
 	      
@@ -1587,7 +1594,12 @@
 		    Scsi_Cmnd * SCtmp;
 		    SCtmp = HOSTDATA(SCpnt->host)->SCint[i];
 		    SCtmp->result = DID_RESET << 16;
-		    if (SCtmp->host_scribble) scsi_free(SCtmp->host_scribble, 512);
+		    if (SCtmp->host_scribble)
+		    {
+		    	 scsi_free(SCtmp->host_scribble, 512);
+		      	SCtmp->host_scribble = 0;
+		    }
+		    	 
 		    printk("Sending DID_RESET for target %d\n", SCpnt->target);
 		    SCtmp->scsi_done(SCpnt);