Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 162503
b: refs/heads/master
c: 6ae5604
h: refs/heads/master
i:
  162501: 10e9756
  162499: c0422ef
  162495: 65efea7
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent bfbfe97 commit 22443e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5ec3487ac566dd443365100eab6861f004f617fb
refs/heads/master: 6ae56042c19afe8d6be91b5d80ba85d695fa982d
4 changes: 3 additions & 1 deletion trunk/drivers/staging/et131x/et131x_initpci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 22443e3

Please sign in to comment.