Automatic merge with /usr/src/ntfs-2.6.git.

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
                 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;