From cf2b6b4e953e0dc37ba5ccc5f51e93abdb9623a9 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 13 Jun 2011 20:39:15 +0200 Subject: [PATCH] --- yaml --- r: 257794 b: refs/heads/master c: 6323e4fe7f61f77c87c26d2b5dcb3472246c1341 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/atari_NCR5380.c | 5 +++++ trunk/drivers/scsi/atari_scsi.c | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 73696646eecc..da101ca478ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50f87f910db0f6dcd3eb569e76c4a48c5315198c +refs/heads/master: 6323e4fe7f61f77c87c26d2b5dcb3472246c1341 diff --git a/trunk/drivers/scsi/atari_NCR5380.c b/trunk/drivers/scsi/atari_NCR5380.c index 24652f13dfd9..2db79b469d9e 100644 --- a/trunk/drivers/scsi/atari_NCR5380.c +++ b/trunk/drivers/scsi/atari_NCR5380.c @@ -892,6 +892,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 (Scsi_Cmnd *cmd, * void (*done)(Scsi_Cmnd *)) diff --git a/trunk/drivers/scsi/atari_scsi.c b/trunk/drivers/scsi/atari_scsi.c index 3e8658e2f154..04a154f87e3e 100644 --- a/trunk/drivers/scsi/atari_scsi.c +++ b/trunk/drivers/scsi/atari_scsi.c @@ -730,6 +730,7 @@ int atari_scsi_release(struct Scsi_Host *sh) free_irq(IRQ_TT_MFP_SCSI, sh); if (atari_dma_buffer) atari_stram_free(atari_dma_buffer); + NCR5380_exit(sh); return 1; }