Merge branch 'linux-2.6'

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/sun3_scsi_vme.c b/drivers/scsi/sun3_scsi_vme.c
index 7cb4a31453e6..02d9727f017a 100644
--- a/drivers/scsi/sun3_scsi_vme.c
+++ b/drivers/scsi/sun3_scsi_vme.c
@@ -230,7 +230,7 @@ static int sun3scsi_detect(struct scsi_host_template * tpnt)
         ((struct NCR5380_hostdata *)instance->hostdata)->ctrl = 0;
 
         if (request_irq(instance->irq, scsi_sun3_intr,
-                             0, "Sun3SCSI-5380VME", NULL)) {
+                        0, "Sun3SCSI-5380VME", instance)) {
 #ifndef REAL_DMA
                 printk("scsi%d: IRQ%d not free, interrupts disabled\n",
                        instance->host_no, instance->irq);
@@ -279,7 +279,7 @@ static int sun3scsi_detect(struct scsi_host_template * tpnt)
 int sun3scsi_release (struct Scsi_Host *shpnt)
 {
         if (shpnt->irq != SCSI_IRQ_NONE)
-                free_irq (shpnt->irq, NULL);
+                free_irq(shpnt->irq, shpnt);
 
         iounmap((void *)sun3_scsi_regp);