From 8feeb6ee368ff305280fd863949778844ba15239 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Wed, 26 May 2010 14:43:05 -0700
Subject: [PATCH] --- yaml --- r: 198743 b: refs/heads/master c:
 04b1c384fbc4e0209e5c1affb67050886376d44b h: refs/heads/master i:   198741:
 7b8727432a26fc316f74bc33fc6171f12b703a2c   198739:
 6464a234393a590d1b5f6bb5966860c30e137b17   198735:
 120599c085b8fe0d9a4790da5273d5b0458a86a9 v: v3

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

diff --git a/[refs] b/[refs]
index af5c46bf241b..061f34ce037f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d47419cd967a4f032a194148a7b08afad32faded
+refs/heads/master: 04b1c384fbc4e0209e5c1affb67050886376d44b
diff --git a/trunk/kernel/kmod.c b/trunk/kernel/kmod.c
index ad9f2edebd67..6e9b19667a8d 100644
--- a/trunk/kernel/kmod.c
+++ b/trunk/kernel/kmod.c
@@ -235,10 +235,10 @@ static void __call_usermodehelper(struct work_struct *work)
 	case UMH_WAIT_PROC:
 		if (pid > 0)
 			break;
-		sub_info->retval = pid;
 		/* FALLTHROUGH */
-
 	case UMH_WAIT_EXEC:
+		if (pid < 0)
+			sub_info->retval = pid;
 		complete(sub_info->complete);
 	}
 }