diff options
| author | Mike Hernandez <michael.hernandez@qlogic.com> | 2010-11-24 01:52:47 +0100 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-12-09 20:25:03 +0100 |
| commit | 7992abfc8b851456f2dfac3229ecb3a5e5637df0 (patch) | |
| tree | a63e704dad70a0785e95abf647cb810675776aa9 /drivers/scsi/qla2xxx/qla_isr.c | |
| parent | [SCSI] qla2xxx: Populate Command Type 6 LUN field properly. (diff) | |
| download | linux-7992abfc8b851456f2dfac3229ecb3a5e5637df0.tar.xz linux-7992abfc8b851456f2dfac3229ecb3a5e5637df0.zip | |
[SCSI] qla2xxx: Change MSI initialization from using incorrect request_irq parameter.
IRQF_SHARED flag should not be set when calling request_irq for MSI
since this interrupt mechanism cannot be shared like standard INTx.
Signed-off-by: Mike Hernandez <michael.hernandez@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_isr.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_isr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 1f06ddd9bdd1..7f77898486a9 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -2491,14 +2491,15 @@ skip_msix: skip_msi: ret = request_irq(ha->pdev->irq, ha->isp_ops->intr_handler, - IRQF_SHARED, QLA2XXX_DRIVER_NAME, rsp); + ha->flags.msi_enabled ? 0 : IRQF_SHARED, + QLA2XXX_DRIVER_NAME, rsp); if (ret) { qla_printk(KERN_WARNING, ha, "Failed to reserve interrupt %d already in use.\n", ha->pdev->irq); goto fail; } - ha->flags.inta_enabled = 1; + clear_risc_ints: /* |