summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Gordeev <agordeev@redhat.com>2014-03-12 16:08:49 -0500
committerJames Bottomley <JBottomley@Parallels.com>2014-03-19 15:04:40 -0700
commit739910de5bfdd47ba77a19fa54bad3b52ac0d633 (patch)
tree098e7d736b198aedd751d0e3569fc7693ac23b39
parent6270e5932a01d6536dbce27782e8adf2180598d8 (diff)
downloadop-kernel-dev-739910de5bfdd47ba77a19fa54bad3b52ac0d633.zip
op-kernel-dev-739910de5bfdd47ba77a19fa54bad3b52ac0d633.tar.gz
[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>
-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 25dc6e5..09fdfd7 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)
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;
}
OpenPOWER on IntegriCloud