From 22443e3419b325d2ed6bb5b9b3bf30cca6530af4 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 27 Aug 2009 10:59:21 +0100 Subject: [PATCH] --- yaml --- r: 162503 b: refs/heads/master c: 6ae56042c19afe8d6be91b5d80ba85d695fa982d h: refs/heads/master i: 162501: 10e9756c003223cd8e902aca342948ea166bb0c6 162499: c0422ef26bea34feea0ac8c47a208dcb61ec2e78 162495: 65efea7e7a71452b2aa0b220097a7737aed0da05 v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et131x_initpci.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4fa4cae46ad5..0d81df1233db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ec3487ac566dd443365100eab6861f004f617fb +refs/heads/master: 6ae56042c19afe8d6be91b5d80ba85d695fa982d diff --git a/trunk/drivers/staging/et131x/et131x_initpci.c b/trunk/drivers/staging/et131x/et131x_initpci.c index 86bd55d2aeac..5485dd7ee4ee 100644 --- a/trunk/drivers/staging/et131x/et131x_initpci.c +++ b/trunk/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 @@ int __devinit et131x_pci_setup(struct pci_dev *pdev, err_iounmap: iounmap(adapter->CSRAddress); err_free_dev: + pci_dev_put(pdev); free_netdev(netdev); err_release_res: pci_release_regions(pdev);