]> git.baikalelectronics.ru Git - kernel.git/commit
firmware loader: allow builtin firmware load even if usermodehelper is disabled
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Aug 2011 22:55:30 +0000 (15:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Aug 2011 22:55:30 +0000 (15:55 -0700)
commit8e978a8363154e5a7e1eb9f53c3f3d8334e8897a
tree63323323466399b5eb1a32796c86e3bddd66416e
parentc12697cf1fff875923b8c656bfb319da7ab8de16
firmware loader: allow builtin firmware load even if usermodehelper is disabled

In commit 12fdf7b62e70 ("PM: Print a warning if firmware is requested
when tasks are frozen") we not only printed a warning if somebody tried
to load the firmware when tasks are frozen - we also failed the load.

But that check was done before the check for built-in firmware, and then
when we disallowed usermode helpers during bootup (commit e41c8904ac91:
"Boot up with usermodehelper disabled"), that actually means that
built-in modules can no longer load their firmware even if the firmware
is built in too.  Which used to work, and some people depended on it for
the R100 driver.

So move the test for usermodehelper_is_disabled() down, to after
checking the built-in firmware.

This should fix:

https://bugzilla.kernel.org/show_bug.cgi?id=40952

Reported-by: James Cloos <cloos@hjcloos.com>
Bisected-by: Elimar Riesebieter <riesebie@lxtec.de>
Cc: Michel Dänzer <michel@daenzer.net>
Cc: Rafael Wysocki <rjw@sisk.pl>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/base/firmware_class.c