FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu Kernel Team

 
 
LinkBack Thread Tools
 
Old 03-26-2012, 02:54 PM
Tim Gardner
 
Default UBUNTU: SAUCE: ubuntu drivers: use UMH_WAIT_PROC consistently

BugLink: http://bugs.launchpad.net/bugs/963685

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
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,e nvp,1);
+ call_usermodehelper(ac_dc_check_script_path,argv,e nvp,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
", 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,e nvp,1);
+ call_usermodehelper(ac_dc_check_script_path,argv,e nvp,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_W AIT_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_W AIT_PROC);

#endif
}
--
1.7.9.1


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 
Old 03-26-2012, 06:01 PM
Tim Gardner
 
Default UBUNTU: SAUCE: ubuntu drivers: use UMH_WAIT_PROC consistently

BugLink: http://bugs.launchpad.net/bugs/963685

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
ubuntu/fsam7400/fsam7400.c | 4 ++--
ubuntu/ndiswrapper/loader.c | 6 +++---
ubuntu/rtl8192se/rtl_dm.c | 6 +++---
3 files changed, 8 insertions(+), 8 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
", mode, status == 0 ? "successful" : "FAILED");
}
diff --git a/ubuntu/ndiswrapper/loader.c b/ubuntu/ndiswrapper/loader.c
index e1be090..71e15d9 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 c0a8ef8..e5cf004 100755
--- a/ubuntu/rtl8192se/rtl_dm.c
+++ b/ubuntu/rtl8192se/rtl_dm.c
@@ -427,7 +427,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,e nvp,1);
+ call_usermodehelper(ac_dc_check_script_path,argv,e nvp,UMH_WAIT_PROC);

return;
};
@@ -3612,7 +3612,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_W AIT_PROC);
}

}
@@ -3997,7 +3997,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_W AIT_PROC);

#endif
}
--
1.7.9.1


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 

Thread Tools




All times are GMT. The time now is 12:26 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org