From patchwork Mon Mar 26 11:55:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 148705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id EE1E6B6EF4 for ; Mon, 26 Mar 2012 22:55:59 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SC8We-0007Xi-D5; Mon, 26 Mar 2012 11:55:52 +0000 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SC8Wc-0007XS-Gq for kernel-team@lists.ubuntu.com; Mon, 26 Mar 2012 11:55:50 +0000 Received: from [10.0.2.6] (host-174-45-43-11.hln-mt.client.bresnan.net [174.45.43.11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail.tpi.com (Postfix) with ESMTP id 2D70831466D; Mon, 26 Mar 2012 04:54:53 -0700 (PDT) Message-ID: <4F70592F.6090402@canonical.com> Date: Mon, 26 Mar 2012 05:55:27 -0600 From: Tim Gardner User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120313 Thunderbird/11.0 MIME-Version: 1.0 To: kernel-team@lists.ubuntu.com Subject: [Oneiric PATCH 8/8 v2] UBUNTU: SAUCE: ubuntu drivers: use UMH_WAIT_PROC consistently References: <1332725337-58475-1-git-send-email-tim.gardner@canonical.com> <1332725337-58475-8-git-send-email-tim.gardner@canonical.com> <201203260201.q2Q213CN014810@www262.sakura.ne.jp> <4F70573A.7060305@canonical.com> In-Reply-To: <4F70573A.7060305@canonical.com> X-Enigmail-Version: 1.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: tim.gardner@canonical.com List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@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