aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bmac.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-30 21:37:12 -0500
committerPaul Mackerras <paulus@samba.org>2005-10-30 21:37:12 -0500
commit23fd07750a789a66fe88cf173d52a18f1a387da4 (patch)
tree06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/net/bmac.c
parentbd787d438a59266af3c9f6351644c85ef1dd21fe (diff)
parented28f96ac1960f30f818374d65be71d2fdf811b0 (diff)
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/net/bmac.c')
-rw-r--r--drivers/net/bmac.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 0ee28899fb8d..bbca8ae8018c 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -1690,10 +1690,8 @@ static void __exit bmac_exit(void)
1690{ 1690{
1691 macio_unregister_driver(&bmac_driver); 1691 macio_unregister_driver(&bmac_driver);
1692 1692
1693 if (bmac_emergency_rxbuf != NULL) { 1693 kfree(bmac_emergency_rxbuf);
1694 kfree(bmac_emergency_rxbuf); 1694 bmac_emergency_rxbuf = NULL;
1695 bmac_emergency_rxbuf = NULL;
1696 }
1697} 1695}
1698 1696
1699MODULE_AUTHOR("Randy Gobbel/Paul Mackerras"); 1697MODULE_AUTHOR("Randy Gobbel/Paul Mackerras");