Messages in this thread Patch in this message | | | From | Christian Lamparter <> | Subject | [PATCH] firmware loader: don't cancel _nowait requests when helper is not yet available | Date | Fri, 9 Mar 2012 23:30:24 +0100 |
| |
This patch fixes a regression which was introduced by: "PM: Print a warning if firmware is requested when tasks are frozen"
request_firmware_nowait does not stall in any system resume paths. Therefore, I think it is perfectly save to use request_firmware_nowait from at least the ->complete() callback.
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> --- drivers/base/firmware_class.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 6c9387d..017e020 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -535,7 +535,7 @@ static int _request_firmware(const struct firmware **firmware_p, read_lock_usermodehelper(); - if (WARN_ON(usermodehelper_is_disabled())) { + if (WARN_ON(usermodehelper_is_disabled() && !(nowait && uevent))) { dev_err(device, "firmware: %s will not be loaded\n", name); retval = -EBUSY; goto out; -- 1.7.9.1
| |