Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 211117
b: refs/heads/master
c: 52933f0
h: refs/heads/master
i:
  211115: d6914cf
v: v3
  • Loading branch information
Kulikov Vasiliy authored and David S. Miller committed Sep 27, 2010
1 parent bf8e0a2 commit 43c4743
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 62038e4a146b97352d5911e6ede36c58d4187c3e
refs/heads/master: 52933f052186877afd218aef7a1b2dbdb010939f
4 changes: 2 additions & 2 deletions trunk/drivers/net/ibm_newemac/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2928,7 +2928,7 @@ static int __devinit emac_probe(struct platform_device *ofdev,
if (dev->emac_irq != NO_IRQ)
irq_dispose_mapping(dev->emac_irq);
err_free:
kfree(ndev);
free_netdev(ndev);
err_gone:
/* if we were on the bootlist, remove us as we won't show up and
* wake up all waiters to notify them in case they were waiting
Expand Down Expand Up @@ -2971,7 +2971,7 @@ static int __devexit emac_remove(struct platform_device *ofdev)
if (dev->emac_irq != NO_IRQ)
irq_dispose_mapping(dev->emac_irq);

kfree(dev->ndev);
free_netdev(dev->ndev);

return 0;
}
Expand Down

0 comments on commit 43c4743

Please sign in to comment.