diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-28 23:30:02 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-13 09:13:53 -0700 |
| commit | 91cb632cd8d0a1649d088a50e752459d1e8b3d79 (patch) | |
| tree | 61f3b27100b1b5204e52584a89c5467ca9a720b5 /include | |
| parent | 4aaf8189db4a00e133afbb0e538e8c4f5551a833 (diff) | |
firmware_class: Do not warn that system is not ready from async loads
commit 9b78c1da60b3c62ccdd1509f0902ad19ceaf776b upstream.
If firmware is requested asynchronously, by calling
request_firmware_nowait(), there is no reason to fail the request
(and warn the user) when the system is (presumably temporarily)
unready to handle it (because user space is not available yet or
frozen). For this reason, introduce an alternative routine for
read-locking umhelper_sem, usermodehelper_read_lock_wait(), that
will wait for usermodehelper_disabled to be unset (possibly with
a timeout) and make request_firmware_work_func() use it instead of
usermodehelper_read_trylock().
Accordingly, modify request_firmware() so that it uses
usermodehelper_read_trylock() to acquire umhelper_sem and remove
the code related to that lock from _request_firmware().
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/kmod.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kmod.h b/include/linux/kmod.h index b25e2b80c059..ce9d9a13d777 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h @@ -117,6 +117,7 @@ extern void usermodehelper_init(void); extern int usermodehelper_disable(void); extern void usermodehelper_enable(void); extern int usermodehelper_read_trylock(void); +extern long usermodehelper_read_lock_wait(long timeout); extern void usermodehelper_read_unlock(void); #endif /* __LINUX_KMOD_H__ */ |