Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 18:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: add helper to copy built-in data to pre-alloc buffer

Browse Source 
This makes it clearer that the parameters passed are only used for
the preallocated buffer option, ie, when a caller uses:

	request_firmware_into_buf()

Otherwise this code won't run. We flip the logic just so the actual
prellocated buf code is not indented.

Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Luis R. Rodriguez 2017-11-20 10:23:56 -08:00 committed by Greg Kroah-Hartman
parent 942e743b73
commit 5711ae6d30
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/base/firmware_class.c
View File

@ -146,6 +146,14 @@ static struct firmware_cache fw_cache;
extern struct builtin_fw __start_builtin_fw[]; extern struct builtin_fw __start_builtin_fw[];
extern struct builtin_fw __end_builtin_fw[]; extern struct builtin_fw __end_builtin_fw[];
static void fw_copy_to_prealloc_buf(struct firmware *fw,
void *buf, size_t size)
{
if (!buf || size < fw->size)
return;
memcpy(buf, fw->data, fw->size);
}
static bool fw_get_builtin_firmware(struct firmware *fw, const char *name, static bool fw_get_builtin_firmware(struct firmware *fw, const char *name,
void *buf, size_t size) void *buf, size_t size)
{ {
@ -155,9 +163,8 @@ static bool fw_get_builtin_firmware(struct firmware *fw, const char *name,
if (strcmp(name, b_fw->name) == 0) { if (strcmp(name, b_fw->name) == 0) {
fw->size = b_fw->size; fw->size = b_fw->size;
fw->data = b_fw->data; fw->data = b_fw->data;
fw_copy_to_prealloc_buf(fw, buf, size);
if (buf && fw->size <= size)
memcpy(buf, fw->data, fw->size);
return true; return true;
} }
} }