diff options
| author |   Tej Parkash <tej.parkash@qlogic.com> | 2014-04-09 21:12:24 -0400 |
|---|---|---|
| committer |   Christoph Hellwig <hch@lst.de> | 2014-05-19 19:12:18 +0200 |
| commit | d43ba46fa226b106c66c7c92c8c512ef8515b6ee (patch) | |
| tree | 635df6b522766ca641be67adea4e7660cd9dcadd /drivers/scsi/qla4xxx | |
| parent | qla4xxx: Update driver version to 5.04.00-k5 (diff) | |
| download | linux-dev-d43ba46fa226b106c66c7c92c8c512ef8515b6ee.tar.xz linux-dev-d43ba46fa226b106c66c7c92c8c512ef8515b6ee.zip | |
qla4xxx: Disable INTx interrupt for ISP82XX
Signed-off-by: Tej Parkash <tej.parkash@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/qla4xxx')
| -rw-r--r-- | drivers/scsi/qla4xxx/ql4_isr.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c index b1925d195f41..081b6b78d2c6 100644 --- a/drivers/scsi/qla4xxx/ql4_isr.c +++ b/drivers/scsi/qla4xxx/ql4_isr.c @@ -1526,7 +1526,7 @@ void qla4xxx_process_aen(struct scsi_qla_host * ha, uint8_t process_aen) int qla4xxx_request_irqs(struct scsi_qla_host *ha) { - int ret; + int ret = 0; int rval = QLA_ERROR; if (is_qla40XX(ha)) @@ -1580,15 +1580,13 @@ try_msi: } } - /* - * Prevent interrupts from falling back to INTx mode in cases where - * interrupts cannot get acquired through MSI-X or MSI mode. - */ +try_intx: if (is_qla8022(ha)) { - ql4_printk(KERN_WARNING, ha, "IRQ not attached -- %d.\n", ret); + ql4_printk(KERN_WARNING, ha, "%s: ISP82xx Legacy interrupt not supported\n", + __func__); goto irq_not_attached; } -try_intx: + /* Trying INTx */ ret = request_irq(ha->pdev->irq, ha->isp_ops->intr_handler, IRQF_SHARED, DRIVER_NAME, ha); |