diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 11:25:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 11:25:16 -0700 |
| commit | 62d3af1b5f3aa613e0a489e8d798d45b07f373f4 (patch) | |
| tree | 8f10dfd23c18600392965b69f94dd389e60827d5 /drivers/net/bmac.c | |
| parent | 942b6f62164cf8822dd03b1569777f4663d1abd7 (diff) | |
| parent | e71180f3689e00c5a1095925352a72dacdd62e34 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
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 60dba4a1ca5..73f2fcfc557 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c @@ -1689,10 +1689,8 @@ static void __exit bmac_exit(void) { macio_unregister_driver(&bmac_driver); - if (bmac_emergency_rxbuf != NULL) { - kfree(bmac_emergency_rxbuf); - bmac_emergency_rxbuf = NULL; - } + kfree(bmac_emergency_rxbuf); + bmac_emergency_rxbuf = NULL; } MODULE_AUTHOR("Randy Gobbel/Paul Mackerras"); |