Merge ../linux-2.6

1 files changed, 1 insertions, 3 deletions

diff --git a/arch/ppc64/kernel/lparcfg.c b/arch/ppc64/kernel/lparcfg.c
index e86155770bbc..3e7b2f28ec83 100644
--- a/arch/ppc64/kernel/lparcfg.c
+++ b/arch/ppc64/kernel/lparcfg.c
@@ -599,9 +599,7 @@ int __init lparcfg_init(void)
 void __exit lparcfg_cleanup(void)
 {
         if (proc_ppc64_lparcfg) {
-                if (proc_ppc64_lparcfg->data) {
-                        kfree(proc_ppc64_lparcfg->data);
-                }
+                kfree(proc_ppc64_lparcfg->data);
                 remove_proc_entry("lparcfg", proc_ppc64_lparcfg->parent);
         }
 }