openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

firmware: move completing fw into a helper 

This will be re-used later through a new extensible interface.

Reviewed-by: Josh Boyer <jwboyer@fedoraproject.org>
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Acked-by: Kees Cook <keescook@chromium.org>
This commit is contained in:
Luis R. Rodriguez 2015-07-30 15:48:57 -07:00 committed by Mimi Zohar
parent ed04630b34
commit 5275d194e0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/base/firmware_class.c
View File

@ -322,6 +322,15 @@ static int fw_read_file_contents(struct file *file, struct firmware_buf *fw_buf)
return rc; return rc;
} }
static void fw_finish_direct_load(struct device *device,
struct firmware_buf *buf)
{
mutex_lock(&fw_lock);
set_bit(FW_STATUS_DONE, &buf->status);
complete_all(&buf->completion);
mutex_unlock(&fw_lock);
}
static int fw_get_filesystem_firmware(struct device *device, static int fw_get_filesystem_firmware(struct device *device,
struct firmware_buf *buf) struct firmware_buf *buf)
{ {
@ -363,10 +372,7 @@ static int fw_get_filesystem_firmware(struct device *device,
if (!rc) { if (!rc) {
dev_dbg(device, "direct-loading %s\n", dev_dbg(device, "direct-loading %s\n",
buf->fw_id); buf->fw_id);
mutex_lock(&fw_lock); fw_finish_direct_load(device, buf);
set_bit(FW_STATUS_DONE, &buf->status);
complete_all(&buf->completion);
mutex_unlock(&fw_lock);
} }
return rc; return rc;