diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-09 18:02:02 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-09 18:02:02 -0400 |
| commit | bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd (patch) | |
| tree | d67f525c76b66956ba7ca0d40bc0fcda0e414700 /drivers/net/gianfar.c | |
| parent | 9d7302299ee96ca954fe4ab8ca640333b6e19ad0 (diff) | |
| parent | 7135a71b19be1faf48b7148d77844d03bc0717d6 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index e212f2c5448b..a00ec639c380 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
| @@ -491,6 +491,7 @@ static int gfar_remove(struct of_device *ofdev) | |||
| 491 | 491 | ||
| 492 | dev_set_drvdata(&ofdev->dev, NULL); | 492 | dev_set_drvdata(&ofdev->dev, NULL); |
| 493 | 493 | ||
| 494 | unregister_netdev(priv->ndev); | ||
| 494 | iounmap(priv->regs); | 495 | iounmap(priv->regs); |
| 495 | free_netdev(priv->ndev); | 496 | free_netdev(priv->ndev); |
| 496 | 497 | ||