[SCSI] ipr: Get rid of superfluous call to pci_disbale_msi/msix()

There is no need to call pci_disable_msi() or pci_disable_msix()
in case the call to pci_enable_msi() or pci_enable_msix() failed.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Wen Xiong <wenxiong@linux.vnet.ibm.com>
Acked-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 25dc6e5..09fdfd7 100644 (file)
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -9329,7 +9329,6 @@ static int ipr_enable_msix(struct ipr_ioa_cfg *ioa_cfg)
 
        if (err < 0) {
                ipr_wait_for_pci_err_recovery(ioa_cfg);
-               pci_disable_msix(ioa_cfg->pdev);
                return err;
        }
 
@@ -9353,7 +9352,6 @@ static int ipr_enable_msi(struct ipr_ioa_cfg *ioa_cfg)
 
        if (err < 0) {
                ipr_wait_for_pci_err_recovery(ioa_cfg);
-               pci_disable_msi(ioa_cfg->pdev);
                return err;
        }