From patchwork Tue Jan 24 13:34:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Regnery X-Patchwork-Id: 719131 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 3v78LV3Jrgz9sdm for ; Wed, 25 Jan 2017 00:34:58 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UN/ORkV+"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751054AbdAXNe4 (ORCPT ); Tue, 24 Jan 2017 08:34:56 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:32925 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751028AbdAXNey (ORCPT ); Tue, 24 Jan 2017 08:34:54 -0500 Received: by mail-wm0-f68.google.com with SMTP id r144so34737108wme.0 for ; Tue, 24 Jan 2017 05:34:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=x2cQSWsWg+F7OvViXt9rn6yXJULSwwVNS28GIPaCqQc=; b=UN/ORkV+0VSoQdrfYL9P2I54aYGy7+Lu6hbGOrWp1leNX+NcFx61Et2rX3W17cSLb9 fRx1DoY7M5TBEcvZHs4OFc5vdz8XnGlSThD5/wzqQA1bsFkX8MwJiVeuTuVoEMdtfOfP VjgmXF/9e2EwwR+rpPUT4U1mPH/zddjBAZAG/EtGpuoTg70QSB0ve5i0IhMJqef4N0Fy mSvOAggBnbAHaD5TEbi9H3To5UllXbPHlWYz1HWd17m273HVKqFxUmrUZH+MPXSo6x4Y zjTuvDPPlmzFuwLrxB3kpUKDtdCDNUHFl+icoDsdUWRKSg5j7gsgmX6vmIZRbciY6EQG JZOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=x2cQSWsWg+F7OvViXt9rn6yXJULSwwVNS28GIPaCqQc=; b=QpRCFSe1mEwcxqDSOoC8TMrEbHx1tqFD5fsYkXDqEgHdhiMUwAeZqmxc//oHvHceT/ 9f7lF8i5cmy0fOK/c7QQoXy8BElOAJn7h0cEquxcxYyS55nBgHjgzlM2Ez0SKEMDDwcX UoRhbteuIqWEEzh6MyTrPaWolamQjwrZBW846SyhMGP6ASpr241Fvx8pDTITWO1GT+Yp CLtktEyzRkg1GFl8JwkPyxLTeiu/BkGAyJNX5tqX+2PVhPRzeVcOq9MCrPP8ml2W83Hn 836jXj4krY2gT13Qn7LNt1RnbX05BuIBK8e6l4efALPsLwgnSrlXJIi06OzzotObmFU7 TiJQ== X-Gm-Message-State: AIkVDXLfUgalxPyWYKEwFEZXFQVDeKsndY97g+nHPyZC6Vf7jX3Fg9LUMwxSNho39IICXA== X-Received: by 10.223.169.114 with SMTP id u105mr28382917wrc.173.1485264888132; Tue, 24 Jan 2017 05:34:48 -0800 (PST) Received: from 5250pc-292.koolg.jmrlp.de ([83.243.48.54]) by smtp.gmail.com with ESMTPSA id t103sm18351555wrc.43.2017.01.24.05.34.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 05:34:47 -0800 (PST) From: Tobias Regnery To: netdev@vger.kernel.org, jcliburn@gmail.com, chris.snook@gmail.com Cc: davem@davemloft.net, Tobias Regnery Subject: [PATCH net 1/3] alx: fix wrong condition to free descriptor memory Date: Tue, 24 Jan 2017 14:34:22 +0100 Message-Id: X-Mailer: git-send-email 2.9.3 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The condition to free the descriptor memory is wrong, we want to free the memory if it is set and not if it is unset. Invert the test to fix this issue. Fixes: b0999223f224b ("alx: add ability to allocate and free alx_napi structures") Signed-off-by: Tobias Regnery --- drivers/net/ethernet/atheros/alx/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c index c8f525574d68..765306bd78c2 100644 --- a/drivers/net/ethernet/atheros/alx/main.c +++ b/drivers/net/ethernet/atheros/alx/main.c @@ -703,7 +703,7 @@ static void alx_free_rings(struct alx_priv *alx) if (alx->qnapi[0] && alx->qnapi[0]->rxq) kfree(alx->qnapi[0]->rxq->bufs); - if (!alx->descmem.virt) + if (alx->descmem.virt) dma_free_coherent(&alx->hw.pdev->dev, alx->descmem.size, alx->descmem.virt,