diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-02-03 13:18:03 -0800 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-02-03 13:18:03 -0800 |
commit | ad3efdb72cd921ec52ac94e82595a5d2e7a7b054 (patch) | |
tree | 82046c4821f443614dfd5e507f0edcda95e21f63 /drivers/scsi/qla2xxx/qla_isr.c | |
parent | 6f3e71c0c3f2479e05682e2e563b75decab36591 (diff) | |
parent | f2e767bb5d6ee0d988cb7d4e54b0b21175802b6b (diff) |
Merge remote-tracking branch 'mkp-scsi/4.10/scsi-fixes' into fixes
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_isr.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_isr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 54e1223b66d7..28ffafe473e9 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -3238,7 +3238,7 @@ qla2x00_free_irqs(scsi_qla_host_t *vha) * from a probe failure context. */ if (!ha->rsp_q_map || !ha->rsp_q_map[0]) - return; + goto free_irqs; rsp = ha->rsp_q_map[0]; if (ha->flags.msix_enabled) { @@ -3258,6 +3258,7 @@ qla2x00_free_irqs(scsi_qla_host_t *vha) free_irq(pci_irq_vector(ha->pdev, 0), rsp); } +free_irqs: pci_free_irq_vectors(ha->pdev); } |