From patchwork Wed Feb 1 08:52:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 722389 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 3vCxj34gV9z9sxS for ; Wed, 1 Feb 2017 19:52:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751754AbdBAIwh (ORCPT ); Wed, 1 Feb 2017 03:52:37 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:32023 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751420AbdBAIwg (ORCPT ); Wed, 1 Feb 2017 03:52:36 -0500 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v118qUQC023243 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 1 Feb 2017 08:52:31 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v118qUUv010776 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 1 Feb 2017 08:52:30 GMT Received: from abhmp0010.oracle.com (abhmp0010.oracle.com [141.146.116.16]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v118qTxW007039; Wed, 1 Feb 2017 08:52:29 GMT Received: from mwanda (/154.0.138.2) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 01 Feb 2017 00:52:28 -0800 Date: Wed, 1 Feb 2017 11:52:15 +0300 From: Dan Carpenter To: "David S. Miller" , David VomLehn Cc: Dmitry Bezrukov , Pavel Belous , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch net-next] ethernet: aquantia: fix dma_mapping_error test Message-ID: <20170201085215.GB31514@mwanda> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.0 (2016-04-01) X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org dma_mapping_error() returns 1 if there is an error and 0 if not. Fixes: 018423e90bee ("net: ethernet: aquantia: Add ring support code") Signed-off-by: Dan Carpenter diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c index 817c145520c8..dea9e9bbb8e7 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c @@ -298,9 +298,10 @@ int aq_ring_rx_fill(struct aq_ring_s *self) buff->page, 0, AQ_CFG_RX_FRAME_MAX, DMA_FROM_DEVICE); - err = dma_mapping_error(aq_nic_get_dev(self->aq_nic), buff->pa); - if (err < 0) + if (dma_mapping_error(aq_nic_get_dev(self->aq_nic), buff->pa)) { + err = -ENOMEM; goto err_exit; + } buff = NULL; }