Patchwork [v2,1/2] ipr: Get rid of superfluous call to pci_disable_msi/msix()

login
register
mail settings
Submitter Alexander Gordeev
Date Jan. 30, 2014, 2:09 p.m.
Message ID <20140130140906.GB32349@dhcp-26-207.brq.redhat.com>
Download mbox | patch
Permalink /patch/315359/
State Accepted
Headers show

Comments

Alexander Gordeev - Jan. 30, 2014, 2:09 p.m.
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>
---
 drivers/scsi/ipr.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
Brian King - Feb. 3, 2014, 3:20 p.m.
Acked-by: Brian King <brking@linux.vnet.ibm.com>

Patch

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 96c10ce..48d0cfc 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;
 	}