leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

driver core: firmware loader: don't cache FW_ACTION_NOHOTPLUG firmware

Browse Source 
Generally there are only two drivers which don't need uevent to
handle firmware loading, so don't cache these firmwares during
suspend for these drivers since doing that may block firmware
loading forever.

Both the two drivers are involved in private firmware images, so
they don't hit in direct loading too.

Signed-off-by: Ming Lei <ming.lei@canonical.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ming Lei 2013-05-27 18:30:03 +08:00 committed by Greg Kroah-Hartman
parent f8878dcb84
commit e771d1aafb
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/base/firmware_class.c
View File

@ -993,7 +993,8 @@ _request_firmware_prepare(struct firmware **firmware_p, const char *name,
return 1; /* need to load */
}
static int assign_firmware_buf(struct firmware *fw, struct device *device)
static int assign_firmware_buf(struct firmware *fw, struct device *device,
bool skip_cache)
{
struct firmware_buf *buf = fw->priv;
@ -1010,7 +1011,7 @@ static int assign_firmware_buf(struct firmware *fw, struct device *device)
* device may has been deleted already, but the problem
* should be fixed in devres or driver core.
*/
if (device)
if (device && !skip_cache)
fw_add_devm_name(device, buf->fw_id);
/*
@ -1066,8 +1067,10 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
if (!fw_get_filesystem_firmware(device, fw->priv))
ret = fw_load_from_user_helper(fw, name, device,
uevent, nowait, timeout);
/* don't cache firmware handled without uevent */
if (!ret)
ret = assign_firmware_buf(fw, device);
ret = assign_firmware_buf(fw, device, !uevent);
usermodehelper_read_unlock();