From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dhcp-26-207.brq.redhat.com (unknown [89.24.186.221]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6C3502C1017 for ; Thu, 3 Oct 2013 03:54:47 +1000 (EST) From: Alexander Gordeev To: linux-kernel@vger.kernel.org Subject: [PATCH RFC 43/77] lpfc: Return -ENOSPC when not enough MSI-X vectors available Date: Wed, 2 Oct 2013 12:48:59 +0200 Message-Id: <90e19597e04fa29c5f435d1f43059b69ae7314d4.1380703263.git.agordeev@redhat.com> In-Reply-To: References: Cc: linux-mips@linux-mips.org, "VMware, Inc." , linux-nvme@lists.infradead.org, linux-ide@vger.kernel.org, stable@vger.kernel.org, linux-s390@vger.kernel.org, Andy King , linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org, x86@kernel.org, Alexander Gordeev , linux-pci@vger.kernel.org, iss_storagedev@hp.com, linux-driver@qlogic.com, Tejun Heo , Bjorn Helgaas , Dan Williams , Jon Mason , Ingo Molnar , Solarflare linux maintainers , netdev@vger.kernel.org, Ralf Baechle , e1000-devel@lists.sourceforge.net, Martin Schwidefsky , linux390@de.ibm.com, linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Signed-off-by: Alexander Gordeev --- drivers/scsi/lpfc/lpfc_init.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index d83a1a3..0ec8008 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -8645,9 +8645,13 @@ lpfc_sli4_enable_msix(struct lpfc_hba *phba) goto msg_fail_out; vectors = min(vectors, rc); - if (vectors > 1) - rc = pci_enable_msix(phba->pcidev, phba->sli4_hba.msix_entries, - vectors); + if (vectors < 2) { + rc = -ENOSPC; + goto msg_fail_out; + } + + rc = pci_enable_msix(phba->pcidev, phba->sli4_hba.msix_entries, + vectors); if (rc) { msg_fail_out: lpfc_printf_log(phba, KERN_INFO, LOG_INIT, -- 1.7.7.6