diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-10 04:41:22 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-10 04:41:22 (GMT) |
| commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
| tree | 86459efa47b9c3f69d865b4495beede9c4184003 /drivers/scsi/pas16.c | |
| parent | e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff) | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
| download | linux-fsl-qoriq-b242a60206881559bb3102110048762422e6b74e.tar.xz | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/scsi/pas16.c')
| -rw-r--r-- | drivers/scsi/pas16.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c index ee59656..f2018b4 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); |