From patchwork Mon Mar 26 11:55:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Oneiric, 8/8, v2] UBUNTU: SAUCE: ubuntu drivers: use UMH_WAIT_PROC consistently Date: Mon, 26 Mar 2012 01:55:27 -0000 From: Tim Gardner X-Patchwork-Id: 148705 Message-Id: <4F70592F.6090402@canonical.com> To: kernel-team@lists.ubuntu.com See attached. >From f2f415314310ce099c294f58b623e94a6128f86f Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Sun, 25 Mar 2012 10:59:57 -0600 Subject: [Oneiric PATCH 8/8 v2] UBUNTU: SAUCE: ubuntu drivers: use UMH_WAIT_PROC consistently BugLink: http://bugs.launchpad.net/bugs/963685 Inspired by Testuo Handa, "usermodehelper: use UMH_WAIT_PROC consistently" Signed-off-by: Tim Gardner --- ubuntu/fsam7400/fsam7400.c | 4 ++-- ubuntu/ndiswrapper/loader.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ubuntu/fsam7400/fsam7400.c b/ubuntu/fsam7400/fsam7400.c index cbc40b8..c08e638 100644 --- a/ubuntu/fsam7400/fsam7400.c +++ b/ubuntu/fsam7400/fsam7400.c @@ -222,11 +222,11 @@ static inline void do_ipw2100_loading(int state) if (state == RADIO_ON) { char *argv[] = { "/sbin/modprobe", "-s", "-k", "ipw2100", NULL }; mode = "loading"; - status = call_usermodehelper(argv[0], argv, envp, 1); + status = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC); } else { char *argv[] = { "/sbin/rmmod", "ipw2100", NULL }; mode = "removing"; - status = call_usermodehelper(argv[0], argv, envp, 1); + status = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC); } DEBUG_OUT2("%s of ipw2100 module %s\n", mode, status == 0 ? "successful" : "FAILED"); } diff --git a/ubuntu/ndiswrapper/loader.c b/ubuntu/ndiswrapper/loader.c index c5b14f7..424a220 100644 --- a/ubuntu/ndiswrapper/loader.c +++ b/ubuntu/ndiswrapper/loader.c @@ -100,7 +100,7 @@ struct wrap_driver *load_wrap_driver(struct wrap_device *wd) EXIT1(return NULL); } INIT_COMPLETION(loader_complete); - ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, 1); + ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, UMH_WAIT_PROC); if (ret) { up(&loader_mutex); ERROR("couldn't load driver %s; check system log " @@ -262,7 +262,7 @@ struct wrap_bin_file *get_bin_file(char *bin_file_name) EXIT1(return NULL); } INIT_COMPLETION(loader_complete); - ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, 1); + ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, UMH_WAIT_PROC); if (ret) { up(&loader_mutex); ERROR("couldn't load file %s/%s; check system log " @@ -698,7 +698,7 @@ struct wrap_device *load_wrap_device(struct load_device *load_device) EXIT1(return NULL); } INIT_COMPLETION(loader_complete); - ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, 1); + ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, UMH_WAIT_PROC); if (ret) { up(&loader_mutex); TRACE1("couldn't load device %04x:%04x; check system " -- 1.7.9.1