[PATCH RFC 35/77] ipr: Do not call pci_disable_msi/msix() if pci_enable_msi/msix() failed
From: Alexander Gordeev <hidden>
Date: 2013-10-02 17:56:37
Also in:
linux-ide, linux-pci, linux-rdma, linux-s390, linux-scsi, linuxppc-dev, lkml, netdev, stable
Subsystem:
ibm power linux raid adapter, scsi subsystem, the rest · Maintainers:
Brian King, "James E.J. Bottomley", "Martin K. Petersen", Linus Torvalds
Signed-off-by: Alexander Gordeev <redacted> --- drivers/scsi/ipr.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 36ac1c3..fb57e21 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c@@ -9255,10 +9255,8 @@ static int ipr_enable_msix(struct ipr_ioa_cfg *ioa_cfg) while ((err = pci_enable_msix(ioa_cfg->pdev, entries, vectors)) > 0) vectors = err; - if (err < 0) { - pci_disable_msix(ioa_cfg->pdev); + if (err < 0) return err; - } if (!err) { for (i = 0; i < vectors; i++)
@@ -9278,10 +9276,8 @@ static int ipr_enable_msi(struct ipr_ioa_cfg *ioa_cfg) while ((err = pci_enable_msi_block(ioa_cfg->pdev, vectors)) > 0) vectors = err; - if (err < 0) { - pci_disable_msi(ioa_cfg->pdev); + if (err < 0) return err; - } if (!err) { for (i = 0; i < vectors; i++)
--
1.7.7.6