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