xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firmware_class: Rework usermodehelper check

Browse Source 
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
This commit is contained in:
Rafael J. Wysocki
2012-03-28 23:29:45 +02:00
parent 9a4768d849
commit fe2e39d878
3 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/base/firmware_class.c
View File

@@ -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;