From 7bff8e5a68546ef8a581af536223685d6f99f2b2 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 13 Jun 2011 20:39:19 +0200 Subject: [PATCH] --- yaml --- r: 257798 b: refs/heads/master c: 19b6c51cf05656c9dd970164be52b120162391bf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sun3_NCR5380.c | 5 +++++ trunk/drivers/scsi/sun3_scsi.c | 1 + trunk/drivers/scsi/sun3_scsi_vme.c | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6b9edbb702a4..e4ecbcdc7d95 100644 --- 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 index 0d04c3a00db9..2ba1cb781091 100644 --- 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 index 2ad6b91d71eb..2cc83ef3f37f 100644 --- 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 index cd6d7790c373..c0252db4da68 100644 --- 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; }