Merge branch 'master' into upstream

1 files changed, 3 insertions, 2 deletions

diff --git a/kernel/kmod.c b/kernel/kmod.c
index 1d32defa38ab..5c470c57fb57 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -197,11 +197,12 @@ static void __call_usermodehelper(void *data)
 {
         struct subprocess_info *sub_info = data;
         pid_t pid;
+        int wait = sub_info->wait;
 
         /* CLONE_VFORK: wait until the usermode helper has execve'd
          * successfully We need the data structures to stay around
          * until that is done.  */
-        if (sub_info->wait)
+        if (wait)
                 pid = kernel_thread(wait_for_helper, sub_info,
                                     CLONE_FS | CLONE_FILES | SIGCHLD);
         else
@@ -211,7 +212,7 @@ static void __call_usermodehelper(void *data)
         if (pid < 0) {
                 sub_info->retval = pid;
                 complete(sub_info->complete);
-        } else if (!sub_info->wait)
+        } else if (!wait)
                 complete(sub_info->complete);
 }