From 5aa266571f944a08b37a243e95f99f9fbc6defc1 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 29 Oct 2009 08:56:17 -0600
Subject: [PATCH] --- yaml --- r: 167922 b: refs/heads/master c:
 d553ad864e3b3dde3f1038d491e207021b2d6293 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 52c4da33e1c6..e2e9826ebfb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65afac7d80ab3bc9f81e75eafb71eeb92a3ebdef
+refs/heads/master: d553ad864e3b3dde3f1038d491e207021b2d6293
diff --git a/trunk/kernel/params.c b/trunk/kernel/params.c
index 95ef27cf8e82..00520c43d88c 100644
--- a/trunk/kernel/params.c
+++ b/trunk/kernel/params.c
@@ -222,7 +222,7 @@ int param_set_charp(const char *val, struct kernel_param *kp)
 	 * don't need to; this mangled commandline is preserved. */
 	if (slab_is_available()) {
 		*(char **)kp->arg = kstrdup(val, GFP_KERNEL);
-		if (!kp->arg)
+		if (!*(char **)kp->arg)
 			return -ENOMEM;
 	} else
 		*(const char **)kp->arg = val;