summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-03-28 23:29:45 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2012-03-28 23:29:45 +0200
commitfe2e39d8782d885755139304d8dba0b3e5bfa878 (patch)
tree200fb998fe94b9ccd93d07c59656b8f5ab62c5d7 /drivers/base
parent9a4768d849d28a79566aa37de19b9852d2da8ec4 (diff)
downloadop-kernel-dev-fe2e39d8782d885755139304d8dba0b3e5bfa878.zip
op-kernel-dev-fe2e39d8782d885755139304d8dba0b3e5bfa878.tar.gz
firmware_class: Rework usermodehelper check
Instead of two functions, read_lock_usermodehelper() and usermodehelper_is_disabled(), used in combination, introduce usermodehelper_read_trylock() that will only return with umhelper_sem held if usermodehelper_disabled is unset (and will return -EAGAIN otherwise) and make _request_firmware() use it. Rename read_unlock_usermodehelper() to usermodehelper_read_unlock() to follow the naming convention of the new function. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/firmware_class.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 6c9387d..deee871 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -533,12 +533,10 @@ static int _request_firmware(const struct firmware **firmware_p,
return 0;
}
- read_lock_usermodehelper();
-
- if (WARN_ON(usermodehelper_is_disabled())) {
+ retval = usermodehelper_read_trylock();
+ if (WARN_ON(retval)) {
dev_err(device, "firmware: %s will not be loaded\n", name);
- retval = -EBUSY;
- goto out;
+ goto out_nolock;
}
if (uevent)
@@ -573,8 +571,9 @@ static int _request_firmware(const struct firmware **firmware_p,
fw_destroy_instance(fw_priv);
out:
- read_unlock_usermodehelper();
+ usermodehelper_read_unlock();
+out_nolock:
if (retval) {
release_firmware(firmware);
*firmware_p = NULL;
OpenPOWER on IntegriCloud