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@xxxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html