Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754853AbaBRKHS (ORCPT ); Tue, 18 Feb 2014 05:07:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6336 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754745AbaBRKGo (ORCPT ); Tue, 18 Feb 2014 05:06:44 -0500 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Santosh Raspatur , netdev@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH net-next 05/35] cxgb3: Remove superfluous call to pci_disable_msix() Date: Tue, 18 Feb 2014 11:07:57 +0100 Message-Id: <675f194d3843c6536c9c900e5ee0a1dfa70417d6.1392717503.git.agordeev@redhat.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is no need to call pci_disable_msix() in case the previous call to pci_enable_msix() failed Signed-off-by: Alexander Gordeev Cc: Santosh Raspatur Cc: netdev@vger.kernel.org Cc: linux-pci@vger.kernel.org --- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index 45d7733..b72d2ed 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c @@ -3097,9 +3097,6 @@ static int cxgb_enable_msix(struct adapter *adap) while ((err = pci_enable_msix(adap->pdev, entries, vectors)) > 0) vectors = err; - if (err < 0) - pci_disable_msix(adap->pdev); - if (!err && vectors < (adap->params.nports + 1)) { pci_disable_msix(adap->pdev); err = -1; -- 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/