diff options
Diffstat (limited to 'drivers/scsi/u14-34f.c')
-rw-r--r-- | drivers/scsi/u14-34f.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c index 58d7eee4fe81..640333b1e75c 100644 --- a/drivers/scsi/u14-34f.c +++ b/drivers/scsi/u14-34f.c | |||
@@ -1715,13 +1715,12 @@ static void flush_dev(struct scsi_device *dev, unsigned long cursec, unsigned in | |||
1715 | 1715 | ||
1716 | } | 1716 | } |
1717 | 1717 | ||
1718 | static irqreturn_t ihdlr(int irq, unsigned int j) { | 1718 | static irqreturn_t ihdlr(unsigned int j) |
1719 | { | ||
1719 | struct scsi_cmnd *SCpnt; | 1720 | struct scsi_cmnd *SCpnt; |
1720 | unsigned int i, k, c, status, tstatus, reg, ret; | 1721 | unsigned int i, k, c, status, tstatus, reg, ret; |
1721 | struct mscp *spp, *cpp; | 1722 | struct mscp *spp, *cpp; |
1722 | 1723 | int irq = sh[j]->irq; | |
1723 | if (sh[j]->irq != irq) | ||
1724 | panic("%s: ihdlr, irq %d, sh[j]->irq %d.\n", BN(j), irq, sh[j]->irq); | ||
1725 | 1724 | ||
1726 | /* Check if this board need to be serviced */ | 1725 | /* Check if this board need to be serviced */ |
1727 | if (!((reg = inb(sh[j]->io_port + REG_SYS_INTR)) & IRQ_ASSERTED)) goto none; | 1726 | if (!((reg = inb(sh[j]->io_port + REG_SYS_INTR)) & IRQ_ASSERTED)) goto none; |
@@ -1935,7 +1934,7 @@ static irqreturn_t do_interrupt_handler(int irq, void *shap) { | |||
1935 | if ((j = (unsigned int)((char *)shap - sha)) >= num_boards) return IRQ_NONE; | 1934 | if ((j = (unsigned int)((char *)shap - sha)) >= num_boards) return IRQ_NONE; |
1936 | 1935 | ||
1937 | spin_lock_irqsave(sh[j]->host_lock, spin_flags); | 1936 | spin_lock_irqsave(sh[j]->host_lock, spin_flags); |
1938 | ret = ihdlr(irq, j); | 1937 | ret = ihdlr(j); |
1939 | spin_unlock_irqrestore(sh[j]->host_lock, spin_flags); | 1938 | spin_unlock_irqrestore(sh[j]->host_lock, spin_flags); |
1940 | return ret; | 1939 | return ret; |
1941 | } | 1940 | } |