diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 08:20:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 08:20:11 -0800 |
| commit | 26145f7e7ebc8a5f1b29425d6da62e872031be4a (patch) | |
| tree | d06d4418c6db3683fb06d9035baa8a50c3a5311f /drivers/scsi/t128.c | |
| parent | 8002cedc1adbf51e2d56091534ef7551b88329b4 (diff) | |
| parent | 1e641664301744f0d381de43ae1e12343e60b479 (diff) | |
| download | kernel-crypto-26145f7e7ebc8a5f1b29425d6da62e872031be4a.tar.gz kernel-crypto-26145f7e7ebc8a5f1b29425d6da62e872031be4a.tar.xz kernel-crypto-26145f7e7ebc8a5f1b29425d6da62e872031be4a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] NCR5380: Fix bugs and canonicalize irq handler usage
[SCSI] zfcp: fix cleanup of dismissed error recovery actions
[SCSI] zfcp: fix dismissal of error recovery actions
[SCSI] qla1280: convert to use the data buffer accessors
[SCSI] iscsi: return data transfer residual for data-out commands
[SCSI] iscsi_tcp: fix potential lockup with write commands
[SCSI] aacraid: fix security weakness
[SCSI] aacraid: fix up le32 issues in BlinkLED
[SCSI] aacraid: fix potential panic in thread stop
[SCSI] aacraid: don't assign cpu_to_le32(constant) to u8
Diffstat (limited to 'drivers/scsi/t128.c')
| -rw-r--r-- | drivers/scsi/t128.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c index 248d60b8d89..041eaaace2c 100644 --- a/drivers/scsi/t128.c +++ b/drivers/scsi/t128.c @@ -259,7 +259,8 @@ found: instance->irq = NCR5380_probe_irq(instance, T128_IRQS); if (instance->irq != SCSI_IRQ_NONE) - if (request_irq(instance->irq, t128_intr, IRQF_DISABLED, "t128", instance)) { + if (request_irq(instance->irq, t128_intr, IRQF_DISABLED, "t128", + instance)) { printk("scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq); instance->irq = SCSI_IRQ_NONE; @@ -295,7 +296,7 @@ static int t128_release(struct Scsi_Host *shost) NCR5380_local_declare(); NCR5380_setup(shost); if (shost->irq) - free_irq(shost->irq, NULL); + free_irq(shost->irq, shost); NCR5380_exit(shost); if (shost->io_port && shost->n_io_port) release_region(shost->io_port, shost->n_io_port); |