aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorAlexander Gordeev <agordeev@redhat.com>2014-03-12 17:08:49 -0400
committerJames Bottomley <JBottomley@Parallels.com>2014-03-19 18:04:40 -0400
commit739910de5bfdd47ba77a19fa54bad3b52ac0d633 (patch)
tree098e7d736b198aedd751d0e3569fc7693ac23b39 /drivers/scsi
parent6270e5932a01d6536dbce27782e8adf2180598d8 (diff)
[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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ipr.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 25dc6e594f71..09fdfd747e34 100644
--- 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)
9329 9329
9330 if (err < 0) { 9330 if (err < 0) {
9331 ipr_wait_for_pci_err_recovery(ioa_cfg); 9331 ipr_wait_for_pci_err_recovery(ioa_cfg);
9332 pci_disable_msix(ioa_cfg->pdev);
9333 return err; 9332 return err;
9334 } 9333 }
9335 9334
@@ -9353,7 +9352,6 @@ static int ipr_enable_msi(struct ipr_ioa_cfg *ioa_cfg)
9353 9352
9354 if (err < 0) { 9353 if (err < 0) {
9355 ipr_wait_for_pci_err_recovery(ioa_cfg); 9354 ipr_wait_for_pci_err_recovery(ioa_cfg);
9356 pci_disable_msi(ioa_cfg->pdev);
9357 return err; 9355 return err;
9358 } 9356 }
9359 9357