Merge ../linux-2.6 by hand

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index f2fc1f26cd4b..2a5add257b8f 100644
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -1036,10 +1036,8 @@ static void __exit mace_cleanup(void)
 {
         macio_unregister_driver(&mace_driver);
 
-        if (dummy_buf) {
-                kfree(dummy_buf);
-                dummy_buf = NULL;
-        }
+        kfree(dummy_buf);
+        dummy_buf = NULL;
 }
 
 MODULE_AUTHOR("Paul Mackerras");