---

yaml --- r: 257798 b: refs/heads/master c: 19b6c51 h: refs/heads/master v: v3
git-mirror · Jun 29, 2011 · 7bff8e5 · 7bff8e5
1 parent e7ff98b
commit 7bff8e5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d559c49e026b4b64dbeb9227c70c98ad11518747
+refs/heads/master: 19b6c51cf05656c9dd970164be52b120162391bf
diff --git a/trunk/drivers/scsi/sun3_NCR5380.c b/trunk/drivers/scsi/sun3_NCR5380.c
@@ -890,6 +890,11 @@ static int __init NCR5380_init(struct Scsi_Host *instance, int flags)
     return 0;
 }
 
+static void NCR5380_exit(struct Scsi_Host *instance)
+{
+	/* Empty, as we didn't schedule any delayed work */
+}
+
 /* 
  * Function : int NCR5380_queue_command (struct scsi_cmnd *cmd,
  *	void (*done)(struct scsi_cmnd *))

diff --git a/trunk/drivers/scsi/sun3_scsi.c b/trunk/drivers/scsi/sun3_scsi.c
@@ -314,6 +314,7 @@ int sun3scsi_release (struct Scsi_Host *shpnt)
 
 	iounmap((void *)sun3_scsi_regp);
 
+	NCR5380_exit(shpnt);
 	return 0;
 }
 

diff --git a/trunk/drivers/scsi/sun3_scsi_vme.c b/trunk/drivers/scsi/sun3_scsi_vme.c
@@ -283,6 +283,7 @@ int sun3scsi_release (struct Scsi_Host *shpnt)
 
 	iounmap((void *)sun3_scsi_regp);
 
+	NCR5380_exit(shpnt);
 	return 0;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -314,6 +314,7 @@ int sun3scsi_release (struct Scsi_Host *shpnt) @@
     	iounmap((void *)sun3_scsi_regp);
+    	NCR5380_exit(shpnt);
     	return 0;
     }
@@ Expand Down @@