From patchwork Tue Aug 25 14:58:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 32054 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 2DF7BB7BB8 for ; Wed, 26 Aug 2009 01:04:56 +1000 (EST) Received: by ozlabs.org (Postfix) id 21EA7DDDB2; Wed, 26 Aug 2009 01:04:56 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id AB8C1DDDA2 for ; Wed, 26 Aug 2009 01:04:55 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755315AbZHYPEK (ORCPT ); Tue, 25 Aug 2009 11:04:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755293AbZHYPEK (ORCPT ); Tue, 25 Aug 2009 11:04:10 -0400 Received: from earthlight.etchedpixels.co.uk ([81.2.110.250]:42593 "EHLO bob.linux.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755291AbZHYPEJ (ORCPT ); Tue, 25 Aug 2009 11:04:09 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by bob.linux.org.uk (8.14.3/8.14.3) with ESMTP id n7PEwlaw016386; Tue, 25 Aug 2009 15:58:47 +0100 From: Alan Cox Subject: [PATCH 08/26] et131x: Take a kref for the PCI pointer we cache To: greg@kroah.com, netdev@vger.kernel.org Date: Tue, 25 Aug 2009 15:58:47 +0100 Message-ID: <20090825145844.16176.42524.stgit@localhost.localdomain> In-Reply-To: <20090825145619.16176.68780.stgit@localhost.localdomain> References: <20090825145619.16176.68780.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alan Cox --- drivers/staging/et131x/et131x_initpci.c | 4 +++- 1 files changed, 3 insertions(+), 1 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/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c index 86bd55d..5485dd7 100644 --- a/drivers/staging/et131x/et131x_initpci.c +++ b/drivers/staging/et131x/et131x_initpci.c @@ -742,6 +742,7 @@ void __devexit et131x_pci_remove(struct pci_dev *pdev) unregister_netdev(netdev); et131x_adapter_memory_free(adapter); iounmap(adapter->CSRAddress); + pci_dev_put(adapter->pdev); free_netdev(netdev); pci_release_regions(pdev); pci_disable_device(pdev); @@ -878,7 +879,7 @@ int __devinit et131x_pci_setup(struct pci_dev *pdev, /* Allocate private adapter struct and copy in relevant information */ adapter = netdev_priv(netdev); - adapter->pdev = pdev; + adapter->pdev = pci_dev_get(pdev); adapter->netdev = netdev; /* Do the same for the netdev struct */ @@ -1022,6 +1023,7 @@ err_mem_free: err_iounmap: iounmap(adapter->CSRAddress); err_free_dev: + pci_dev_put(pdev); free_netdev(netdev); err_release_res: pci_release_regions(pdev);