From patchwork Wed Sep 22 20:42:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Tettamanti X-Patchwork-Id: 65455 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 6C418B70DA for ; Thu, 23 Sep 2010 06:43:20 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754374Ab0IVUmu (ORCPT ); Wed, 22 Sep 2010 16:42:50 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:34405 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752802Ab0IVUmt (ORCPT ); Wed, 22 Sep 2010 16:42:49 -0400 Received: by wwb34 with SMTP id 34so16982wwb.1 for ; Wed, 22 Sep 2010 13:42:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=zbHmWaG6k4Q1EIKhAfanjMQlwNobC5KM27cKns7TYes=; b=nCV5DOrORrSGRwAljCxv7yzQVWEmFE5/c/8/fHEGgTpQiVnqnu3CQgK9S24e/VBDnu Mgz/rvZoVfI/wNAr/ID59BcKa6EfrrTz4Jg9ndMPrIWHjqHp8bb67vTxgCrT1x41H9ls tc0LfN/oqhVk8e6RCw6Xqj5ABR7TMb9QWMkPU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=AhFEyYuNbJ6/e0EZTNWPdfLtH/GZJYBy9z4MXkseUFWNdmXh3uGefo9zHhNbGVtUHV n+1tK6g+aRA2rmPAxziwHE+BeZZaqExw/Dw4vY3JrAK5wOS/xq6Fqb65i7wRjz61Cs1k mA9cGwetDka4Yu8cE/3VE6ZU27hhTPkMrWfVw= Received: by 10.227.156.85 with SMTP id v21mr652859wbw.157.1285188159750; Wed, 22 Sep 2010 13:42:39 -0700 (PDT) Received: from nb-core2.darkstar.lan (dynamic-adsl-78-14-229-170.clienti.tiscali.it [78.14.229.170]) by mx.google.com with ESMTPS id bc3sm4402514wbb.14.2010.09.22.13.42.37 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 22 Sep 2010 13:42:38 -0700 (PDT) Date: Wed, 22 Sep 2010 22:42:31 +0200 From: Luca Tettamanti To: netdev@vger.kernel.org Cc: atl1-devel@lists.sourceforge.net, jcliburn@gmail.com, chris.snook@gmail.com, jie.yang@atheros.com Subject: [PATCH 2/2] atl1: zero out CMB and SBM in atl1_free_ring_resources Message-ID: <20100922204231.GA1401@nb-core2.darkstar.lan> References: <20100922.132341.48506736.davem@davemloft.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100922.132341.48506736.davem@davemloft.net> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org They are allocated in atl1_setup_ring_resources, zero out the pointers in atl1_free_ring_resources (like the other resources). Signed-off-by: Luca Tettamanti Acked-by: Chris Snook --- drivers/net/atlx/atl1.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index bbd6e30..c73be28 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c @@ -1251,6 +1251,12 @@ static void atl1_free_ring_resources(struct atl1_adapter *adapter) rrd_ring->desc = NULL; rrd_ring->dma = 0; + + adapter->cmb.dma = 0; + adapter->cmb.cmb = NULL; + + adapter->smb.dma = 0; + adapter->smb.smb = NULL; } static void atl1_setup_mac_ctrl(struct atl1_adapter *adapter)