From patchwork Thu Sep 16 19:29:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Tettamanti X-Patchwork-Id: 64994 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 254A41007D2 for ; Fri, 17 Sep 2010 05:30:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755974Ab0IPTas (ORCPT ); Thu, 16 Sep 2010 15:30:48 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:55813 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755962Ab0IPTar (ORCPT ); Thu, 16 Sep 2010 15:30:47 -0400 Received: by wwb18 with SMTP id 18so304234wwb.1 for ; Thu, 16 Sep 2010 12:30:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references:in-reply-to :references:to; bh=Iwgd357U7roFiJnRppv7VQGiVkgxGcTMlWTpVxPJb70=; b=CorBGzULPelFYjc9AbPtXTZXOPtCe8MjaEFYmGOd3Y39vPpzWtAF831QoKlU1eJW8J SDJPwkcpBPxa5BFwcafRaatfrPY1ukkFRr+S0p0fZLJ8+KEcBkdc1sAnz/4+bVvZcsPt OuvrwtOHrZiW32V8tagOwhwKcxiN/UMPCjUok= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=JS6uknMeBOn5CVU8UzKRQw0NykL0osy04JijzXTekbJEfMQgjFGAfdtGxCz5KOIa0X a/V4WTs5DmCqpSyQWApfw/SQ+rjsTvZxa1KRtZB/llDH9rx2PPo68j06zHpykye6mgMt 0GkP6s3/LYdgqsMU1At5TRz0XmFILBcoBfc/0= Received: by 10.227.147.79 with SMTP id k15mr3241179wbv.128.1284665446125; Thu, 16 Sep 2010 12:30:46 -0700 (PDT) Received: from localhost (dynamic-adsl-78-14-224-164.clienti.tiscali.it [78.14.224.164]) by mx.google.com with ESMTPS id e31sm2614895wbe.17.2010.09.16.12.30.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 16 Sep 2010 12:30:44 -0700 (PDT) Received: from kronos by localhost with local (Exim 4.72) (envelope-from ) id 1OwKAC-0002gd-Em; Thu, 16 Sep 2010 21:30:32 +0200 From: Luca Tettamanti To: netdev@vger.kernel.org Cc: Luca Tettamanti , 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 Date: Thu, 16 Sep 2010 21:29:47 +0200 Message-Id: <1284665387-10289-3-git-send-email-kronos.it@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: To: netdev@vger.kernel.org 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). 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)