From 3d2994adb04df89ddab5f7847ddd7a54a3cce628 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <juhl-lkml@dif.dk>
Date: Sat, 25 Jun 2005 14:58:48 -0700
Subject: [PATCH] --- yaml --- r: 3377 b: refs/heads/master c:
 5a6b454f8024bac68495b6cd51615feb0b54baa9 h: refs/heads/master i:   3375:
 5e4036fdfef5ce5f9fcad972c2339e3e53d59696 v: v3

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

diff --git a/[refs] b/[refs]
index 8e7be6a47182..ca30ce3e1375 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 486fd404fbc840e28a959d2f2842b6c46ed6b250
+refs/heads/master: 5a6b454f8024bac68495b6cd51615feb0b54baa9
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index 24a4d12d5aa9..270ee7fadbd8 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/kernel/sysctl.c
@@ -1000,8 +1000,7 @@ int do_sysctl(int __user *name, int nlen, void __user *oldval, size_t __user *ol
 		int error = parse_table(name, nlen, oldval, oldlenp, 
 					newval, newlen, head->ctl_table,
 					&context);
-		if (context)
-			kfree(context);
+		kfree(context);
 		if (error != -ENOTDIR)
 			return error;
 		tmp = tmp->next;