CHROMIUM: remove warning from request_firmware if UMH failed

The UMH failing is a potential consequence of racing with suspend, so
remove the warning but still print the informational message.

Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
BUG=chrome-os-partner:17270
TEST=(needs an autotest test) currently manual:
use the set_short_powerd_timeouts script to all the device to
idle-suspend quickly, wait for an idle suspend with the lid open
(about 30  seconds). Then hit the trackpad and quickly close the lid.
The device should resume and then suspend again within a few seconds
and make sure there's no warning in dmesg from request_firmware()

Change-Id: Iaf46c53e3d5462286130334ca19edc82a0e661dd
Reviewed-on: https://gerrit.chromium.org/gerrit/42247
Reviewed-by: Aaron Durbin <adurbin@google.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Commit-Queue: Sonny Rao <sonnyrao@chromium.org>
Tested-by: Sonny Rao <sonnyrao@chromium.org>

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 5401814c874df066833c8b5c3ac2dc28e2842490..1a8a6e2616ba0dc7348d332aa6e9b1dd167b0664 100644 (file)
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -594,7 +594,7 @@ request_firmware(const struct firmware **firmware_p, const char *name,
                return PTR_RET(fw_priv);
 
        ret = usermodehelper_read_trylock();
-       if (WARN_ON(ret)) {
+       if (ret) {
                dev_err(device, "firmware: %s will not be loaded\n", name);
        } else {
                ret = _request_firmware_load(fw_priv, true,