diff options
| author | Alexander Gordeev <agordeev@redhat.com> | 2014-07-16 14:05:15 -0400 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-07-29 08:38:53 -0400 |
| commit | 029165acfa611a3a8838723f6978586ae35ff53d (patch) | |
| tree | 0c7b4af43ff9e96a66817ca63413b0c2138a6d71 /drivers/scsi/lpfc/lpfc_init.c | |
| parent | e85525c39e29b6da1cefc63c109590231c300059 (diff) | |
lpfc: Remove superfluous call to pci_disable_msix()
There is no need to call pci_disable_msix() in case
the previous call to pci_enable_msix() failed
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Acked-by: James Smart <james.smart@emulex.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_init.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_init.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 06f9a5b79e66..a5769a9960ac 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c | |||
| @@ -8242,7 +8242,7 @@ lpfc_sli_enable_msix(struct lpfc_hba *phba) | |||
| 8242 | if (rc) { | 8242 | if (rc) { |
| 8243 | lpfc_printf_log(phba, KERN_INFO, LOG_INIT, | 8243 | lpfc_printf_log(phba, KERN_INFO, LOG_INIT, |
| 8244 | "0420 PCI enable MSI-X failed (%d)\n", rc); | 8244 | "0420 PCI enable MSI-X failed (%d)\n", rc); |
| 8245 | goto msi_fail_out; | 8245 | goto vec_fail_out; |
| 8246 | } | 8246 | } |
| 8247 | for (i = 0; i < LPFC_MSIX_VECTORS; i++) | 8247 | for (i = 0; i < LPFC_MSIX_VECTORS; i++) |
| 8248 | lpfc_printf_log(phba, KERN_INFO, LOG_INIT, | 8248 | lpfc_printf_log(phba, KERN_INFO, LOG_INIT, |
| @@ -8320,6 +8320,8 @@ irq_fail_out: | |||
| 8320 | msi_fail_out: | 8320 | msi_fail_out: |
| 8321 | /* Unconfigure MSI-X capability structure */ | 8321 | /* Unconfigure MSI-X capability structure */ |
| 8322 | pci_disable_msix(phba->pcidev); | 8322 | pci_disable_msix(phba->pcidev); |
| 8323 | |||
| 8324 | vec_fail_out: | ||
| 8323 | return rc; | 8325 | return rc; |
| 8324 | } | 8326 | } |
| 8325 | 8327 | ||
| @@ -8812,7 +8814,7 @@ enable_msix_vectors: | |||
| 8812 | } else if (rc) { | 8814 | } else if (rc) { |
| 8813 | lpfc_printf_log(phba, KERN_INFO, LOG_INIT, | 8815 | lpfc_printf_log(phba, KERN_INFO, LOG_INIT, |
| 8814 | "0484 PCI enable MSI-X failed (%d)\n", rc); | 8816 | "0484 PCI enable MSI-X failed (%d)\n", rc); |
| 8815 | goto msi_fail_out; | 8817 | goto vec_fail_out; |
| 8816 | } | 8818 | } |
| 8817 | 8819 | ||
| 8818 | /* Log MSI-X vector assignment */ | 8820 | /* Log MSI-X vector assignment */ |
| @@ -8875,9 +8877,10 @@ cfg_fail_out: | |||
| 8875 | &phba->sli4_hba.fcp_eq_hdl[index]); | 8877 | &phba->sli4_hba.fcp_eq_hdl[index]); |
| 8876 | } | 8878 | } |
| 8877 | 8879 | ||
| 8878 | msi_fail_out: | ||
| 8879 | /* Unconfigure MSI-X capability structure */ | 8880 | /* Unconfigure MSI-X capability structure */ |
| 8880 | pci_disable_msix(phba->pcidev); | 8881 | pci_disable_msix(phba->pcidev); |
| 8882 | |||
| 8883 | vec_fail_out: | ||
| 8881 | return rc; | 8884 | return rc; |
| 8882 | } | 8885 | } |
| 8883 | 8886 | ||