Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755672Ab3JBR4h (ORCPT ); Wed, 2 Oct 2013 13:56:37 -0400 Received: from 221-186-24-89.in-addr.arpa ([89.24.186.221]:27151 "EHLO dhcp-26-207.brq.redhat.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1755050Ab3JBR4f (ORCPT ); Wed, 2 Oct 2013 13:56:35 -0400 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Bjorn Helgaas , Ralf Baechle , Michael Ellerman , Benjamin Herrenschmidt , Martin Schwidefsky , Ingo Molnar , Tejun Heo , Dan Williams , Andy King , Jon Mason , Matt Porter , stable@vger.kernel.org, linux-pci@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, linux390@de.ibm.com, linux-s390@vger.kernel.org, x86@kernel.org, linux-ide@vger.kernel.org, iss_storagedev@hp.com, linux-nvme@lists.infradead.org, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net, linux-driver@qlogic.com, Solarflare linux maintainers , "VMware, Inc." , linux-scsi@vger.kernel.org Subject: [PATCH RFC 35/77] ipr: Do not call pci_disable_msi/msix() if pci_enable_msi/msix() failed Date: Wed, 2 Oct 2013 12:48:51 +0200 Message-Id: <5d673eed9f7742f0551214d273a4fa905a721ac4.1380703263.git.agordeev@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1145 Lines: 41 Signed-off-by: Alexander Gordeev --- 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 linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/