Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5275d194 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Mimi Zohar
Browse files

firmware: move completing fw into a helper 



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

Reviewed-by: default avatarJosh Boyer <jwboyer@fedoraproject.org>
Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
Acked-by: default avatarKees Cook <keescook@chromium.org>
parent ed04630b

drivers/base/firmware_class.c

+10 −4
Original line number Diff line number Diff line
@@ -322,6 +322,15 @@ static int fw_read_file_contents(struct file *file, struct firmware_buf *fw_buf) 
	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,

				       struct firmware_buf *buf)

{
@@ -363,10 +372,7 @@ static int fw_get_filesystem_firmware(struct device *device, 
	if (!rc) {

		dev_dbg(device, "direct-loading %s\n",

			buf->fw_id);

		mutex_lock(&fw_lock);

		set_bit(FW_STATUS_DONE, &buf->status);

		complete_all(&buf->completion);

		mutex_unlock(&fw_lock);

		fw_finish_direct_load(device, buf);

	}



	return rc;