From patchwork Mon Mar 26 14:54:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 148759 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 469E1B6FA3 for ; Tue, 27 Mar 2012 01:54:30 +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 1SCBJK-0007vB-TE; Mon, 26 Mar 2012 14:54:18 +0000 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SCBJF-0007tu-EX for kernel-team@lists.ubuntu.com; Mon, 26 Mar 2012 14:54:13 +0000 Received: from salmon.rtg.net (mail.tpi.com [70.99.223.143]) by mail.tpi.com (Postfix) with ESMTP id C019D314673 for ; Mon, 26 Mar 2012 07:53:53 -0700 (PDT) Received: by salmon.rtg.net (Postfix, from userid 1000) id AACA9203B2; Mon, 26 Mar 2012 08:54:12 -0600 (MDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [Natty PATCH 8/8] UBUNTU: SAUCE: ubuntu drivers: use UMH_WAIT_PROC consistently Date: Mon, 26 Mar 2012 08:54:00 -0600 Message-Id: <1332773641-125992-9-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1332773641-125992-1-git-send-email-tim.gardner@canonical.com> References: <1332773641-125992-1-git-send-email-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/963685 Signed-off-by: Tim Gardner --- drivers/staging/rtl8192e/r8192E_dm.c | 2 +- ubuntu/fsam7400/fsam7400.c | 4 ++-- ubuntu/ndiswrapper/loader.c | 6 +++--- ubuntu/rtl8192se/rtl_dm.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/r8192E_dm.c b/drivers/staging/rtl8192e/r8192E_dm.c index 0f7bc52..a59ee1a 100644 --- a/drivers/staging/rtl8192e/r8192E_dm.c +++ b/drivers/staging/rtl8192e/r8192E_dm.c @@ -257,7 +257,7 @@ void dm_check_ac_dc_power(struct net_device *dev) if(priv->ieee80211->state != IEEE80211_LINKED) { return; } - call_usermodehelper(ac_dc_check_script_path,argv,envp,1); + call_usermodehelper(ac_dc_check_script_path,argv,envp,UMH_WAIT_PROC); } void hal_dm_watchdog(struct net_device *dev) 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 " diff --git a/ubuntu/rtl8192se/rtl_dm.c b/ubuntu/rtl8192se/rtl_dm.c index 7016417..48d734d 100644 --- a/ubuntu/rtl8192se/rtl_dm.c +++ b/ubuntu/rtl8192se/rtl_dm.c @@ -421,7 +421,7 @@ void dm_check_ac_dc_power(struct net_device *dev) if(priv->rtllib->state != RTLLIB_LINKED) { return; } - call_usermodehelper(ac_dc_check_script_path,argv,envp,1); + call_usermodehelper(ac_dc_check_script_path,argv,envp,UMH_WAIT_PROC); return; }; @@ -3611,7 +3611,7 @@ extern void dm_CheckRfCtrlGPIO(void *data) argv[0] = RadioPowerPath; argv[2] = NULL; - call_usermodehelper(RadioPowerPath,argv,envp,1); + call_usermodehelper(RadioPowerPath,argv,envp,UMH_WAIT_PROC); } } @@ -3996,7 +3996,7 @@ extern void dm_CheckRfCtrlGPIO(void *data) argv[0] = RadioPowerPath; argv[2] = NULL; - call_usermodehelper(RadioPowerPath,argv,envp,1); + call_usermodehelper(RadioPowerPath,argv,envp,UMH_WAIT_PROC); #endif }