Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[karo-tx-linux.git] / lib / kobject_uevent.c

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 12e311dc664cc8d58aa29264050e2f4a8f234e2c..bd5ecbbafab1cff8926f8ef14af983051209af23 100644 (file)
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -208,7 +208,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                argv [0] = uevent_helper;
                argv [1] = (char *)subsystem;
                argv [2] = NULL;
-               call_usermodehelper (argv[0], argv, envp, 0);
+               call_usermodehelper (argv[0], argv, envp, UMH_WAIT_EXEC);
        }
 
 exit: