Merge ../linux-2.6 by hand

[linux-2.6-omap-h63xx.git] / drivers / net / bmac.c

diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 0ee28899fb8dd636061d6073c6288a9629c42165..bbca8ae8018c3718e0e41dd723f61d1712489791 100644 (file)
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -1690,10 +1690,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");