From patchwork Sun Mar 23 20:26:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?J=CE=B5an_Sacren?= X-Patchwork-Id: 332918 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 713FA2C00A5 for ; Mon, 24 Mar 2014 07:30:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751283AbaCWUaW (ORCPT ); Sun, 23 Mar 2014 16:30:22 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:58122 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750933AbaCWUaU (ORCPT ); Sun, 23 Mar 2014 16:30:20 -0400 Received: by mail-pd0-f173.google.com with SMTP id z10so4466539pdj.32 for ; Sun, 23 Mar 2014 13:30:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=BmQDvEHwruh8MK7x/fz9QoCKB98VpQjqmAqLmMOkIdI=; b=fCGoi1euPXpGY2x6qnLS/88ckSuntvsqRvJAd0O2BXSUYNxoTA2AKme+ffXo1hq5XC ZvWTIvFm5KO4HElXK/HIWEbXHb8YrDqTqaYHinZwGY+jvDJEUazL0rHkmGgPSOGDdfME EhYBe2CxNrWX70ffyLUbynUPDoZ/J++9iGD+h4pDH5RJbIZAEiybGsqHoAr4FKJdDQ85 pWNeewy38ium/5b8K47l+XetssvAmcAtFlV9TNeSwbDGgEMg3kOrQf3+HmiDGi7MSzDk vAu0t3U3csDqQBmgGzZRYqalTV8WXBOxT7iCZCT89wtu3tDXBMPDqfvJdSFIJAtUtK2Q ZCWw== X-Received: by 10.67.3.97 with SMTP id bv1mr68025922pad.54.1395606620291; Sun, 23 Mar 2014 13:30:20 -0700 (PDT) Received: from localhost ([76.8.208.236]) by mx.google.com with ESMTPSA id op3sm27179481pbc.40.2014.03.23.13.30.17 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 23 Mar 2014 13:30:18 -0700 (PDT) From: Jean Sacren To: Jeff Kirsher Cc: e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org, Mitch Williams Subject: [PATCH net-next] i40e: i40evf: fix error checking path Date: Sun, 23 Mar 2014 14:26:58 -0600 Message-Id: <1395606418-22964-1-git-send-email-sakiwit@gmail.com> X-Mailer: git-send-email 1.8.3.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The commit 6494294f277fd ("i40e/i40evf: Use dma_set_mask_and_coherent") uses dma_set_mask_and_coherent() to replace dma_set_coherent_mask() for the benefit of return error. The conversion brings some confusion in error checking as whether against DMA_BIT_MASK(64) or DMA_BIT_MASK(32). For one, if error is zero, the check will be against DMA_BIT_MASK(64) twice. Fix this error checking by binding the check to the pertinent one. Signed-off-by: Jean Sacren Cc: Mitch Williams --- drivers/net/ethernet/intel/i40e/i40e_main.c | 11 ++++++----- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 113354214517..37b2f55ea43b 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -8041,12 +8041,13 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) /* set up for high or low dma */ err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); - if (err) - err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); if (err) { - dev_err(&pdev->dev, - "DMA configuration failed: 0x%x\n", err); - goto err_dma; + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + if (err) { + dev_err(&pdev->dev, + "DMA configuration failed: 0x%x\n", err); + goto err_dma; + } } /* set up pci connections */ diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c index d381bcc4ea9f..fdf9edf97ff1 100644 --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c @@ -2188,12 +2188,13 @@ static int i40evf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return err; err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); - if (err) - err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); if (err) { - dev_err(&pdev->dev, - "DMA configuration failed: 0x%x\n", err); - goto err_dma; + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + if (err) { + dev_err(&pdev->dev, + "DMA configuration failed: 0x%x\n", err); + goto err_dma; + } } err = pci_request_regions(pdev, i40evf_driver_name);