diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 | 
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 | 
| commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
| tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /drivers/net/bmac.c | |
| parent | 5615ca7906aefbdc3318604c89db5931d0a25910 (diff) | |
| parent | be15cd72d256e5eb3261a781b8507fac83ab33f6 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/bmac.c')
| -rw-r--r-- | drivers/net/bmac.c | 6 | 
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c index 60dba4a1ca5c..73f2fcfc557f 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c  | |||
| @@ -1689,10 +1689,8 @@ static void __exit bmac_exit(void) | |||
| 1689 | { | 1689 | { | 
| 1690 | macio_unregister_driver(&bmac_driver); | 1690 | macio_unregister_driver(&bmac_driver); | 
| 1691 | 1691 | ||
| 1692 | if (bmac_emergency_rxbuf != NULL) { | 1692 | kfree(bmac_emergency_rxbuf); | 
| 1693 | kfree(bmac_emergency_rxbuf); | 1693 | bmac_emergency_rxbuf = NULL; | 
| 1694 | bmac_emergency_rxbuf = NULL; | ||
| 1695 | } | ||
| 1696 | } | 1694 | } | 
| 1697 | 1695 | ||
| 1698 | MODULE_AUTHOR("Randy Gobbel/Paul Mackerras"); | 1696 | MODULE_AUTHOR("Randy Gobbel/Paul Mackerras"); | 
