Merge branch 'linux-2.6'

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index ee5965659971..f2018b46f494 100644
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -453,7 +453,8 @@ int __init pas16_detect(struct scsi_host_template * tpnt)
             instance->irq = NCR5380_probe_irq(instance, PAS16_IRQS);
 
         if (instance->irq != SCSI_IRQ_NONE) 
-            if (request_irq(instance->irq, pas16_intr, IRQF_DISABLED, "pas16", instance)) {
+            if (request_irq(instance->irq, pas16_intr, IRQF_DISABLED,
+                            "pas16", instance)) {
                 printk("scsi%d : IRQ%d not free, interrupts disabled\n", 
                     instance->host_no, instance->irq);
                 instance->irq = SCSI_IRQ_NONE;
@@ -604,7 +605,7 @@ static inline int NCR5380_pwrite (struct Scsi_Host *instance, unsigned char *src
 static int pas16_release(struct Scsi_Host *shost)
 {
         if (shost->irq)
-                free_irq(shost->irq, NULL);
+                free_irq(shost->irq, shost);
         NCR5380_exit(shost);
         if (shost->dma_channel != 0xff)
                 free_dma(shost->dma_channel);