From 75ebd5343862a280f87ba1c6621e8d6df0d69b8e Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Sat, 4 Feb 2006 20:35:59 +0100
Subject: [PATCH] --- yaml --- r: 20075 b: refs/heads/master c:
 95eff20feb679a2223a6da1e7f272fe9aa99591e h: refs/heads/master i:   20073:
 ba7ed87f97ff917927f90014383929d7057122b3   20071:
 4f835faf1b3b1669079a1ad83aa3b4f62086f862 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/powerpc/kernel/rtas_flash.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index df602ee04e59..35de845d2ea0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4009d980224389c33dce1565e0ac9f673354c43f
+refs/heads/master: 95eff20feb679a2223a6da1e7f272fe9aa99591e
diff --git a/trunk/arch/powerpc/kernel/rtas_flash.c b/trunk/arch/powerpc/kernel/rtas_flash.c
index 50500093c97f..aaf384c3f04a 100644
--- a/trunk/arch/powerpc/kernel/rtas_flash.c
+++ b/trunk/arch/powerpc/kernel/rtas_flash.c
@@ -672,8 +672,7 @@ static void rtas_flash_firmware(int reboot_type)
 static void remove_flash_pde(struct proc_dir_entry *dp)
 {
 	if (dp) {
-		if (dp->data != NULL)
-			kfree(dp->data);
+		kfree(dp->data);
 		dp->owner = NULL;
 		remove_proc_entry(dp->name, dp->parent);
 	}