aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJesper Juhl <juhl-lkml@dif.dk>2005-06-25 17:58:48 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 19:24:59 -0400
commit5a6b454f8024bac68495b6cd51615feb0b54baa9 (patch)
tree5514a66b49478b01c67527bb34b0f16aae4511e7 /kernel
parent486fd404fbc840e28a959d2f2842b6c46ed6b250 (diff)
[PATCH] remove redundant NULL check before before kfree() in kernel/sysctl.c
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sysctl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 24a4d12d5aa9..270ee7fadbd8 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1000,8 +1000,7 @@ int do_sysctl(int __user *name, int nlen, void __user *oldval, size_t __user *ol
1000 int error = parse_table(name, nlen, oldval, oldlenp, 1000 int error = parse_table(name, nlen, oldval, oldlenp,
1001 newval, newlen, head->ctl_table, 1001 newval, newlen, head->ctl_table,
1002 &context); 1002 &context);
1003 if (context) 1003 kfree(context);
1004 kfree(context);
1005 if (error != -ENOTDIR) 1004 if (error != -ENOTDIR)
1006 return error; 1005 return error;
1007 tmp = tmp->next; 1006 tmp = tmp->next;