samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Koodi Ongelmat Pull-pyynnöt Actions Paketit Projektit Julkaisut Wiki Toiminta

Merge "dsp: adsp-loader: Support dynamic size for array priv->adsp_fw_name."

Selaa lähdekoodia
This commit is contained in:
qctecmdr
2019-10-03 20:07:55 -07:00
committed by Gerrit - the friendly Code Review server
vanhempi 3c19b49560 72066d3ab6
commit 46c1ee44b8
1 muutettua tiedostoa jossa 6 lisäystä ja 3 poistoa
Download Patch File Download Diff File Expand all files Collapse all files

9
dsp/adsp-loader.c
Näytä tiedosto

@@ -7,6 +7,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/string.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <ipc/apr.h> #include <ipc/apr.h>
@@ -22,7 +23,6 @@
#define SSR_RESET_CMD 1 #define SSR_RESET_CMD 1
#define IMAGE_UNLOAD_CMD 0 #define IMAGE_UNLOAD_CMD 0
#define MAX_FW_IMAGES 4 #define MAX_FW_IMAGES 4
#define ADSP_FW_NAME_MAX_LENGTH 5
static ssize_t adsp_boot_store(struct kobject *kobj, static ssize_t adsp_boot_store(struct kobject *kobj,
struct kobj_attribute *attr, struct kobj_attribute *attr,
@@ -330,6 +330,7 @@ static int adsp_loader_probe(struct platform_device *pdev)
int adsp_fw_cnt; int adsp_fw_cnt;
u32* adsp_fw_bit_values = NULL; u32* adsp_fw_bit_values = NULL;
int i; int i;
int fw_name_size;
u32 adsp_var_idx; u32 adsp_var_idx;
int ret = 0; int ret = 0;
@@ -398,12 +399,14 @@ static int adsp_loader_probe(struct platform_device *pdev)
for (i = 0; i < adsp_fw_cnt; i++) { for (i = 0; i < adsp_fw_cnt; i++) {
if (adsp_fw_bit_values[i] == adsp_var_idx) { if (adsp_fw_bit_values[i] == adsp_var_idx) {
fw_name_size = strlen(adsp_fw_name_array[i]) + 1;
priv->adsp_fw_name = devm_kzalloc(&pdev->dev, priv->adsp_fw_name = devm_kzalloc(&pdev->dev,
ADSP_FW_NAME_MAX_LENGTH, GFP_KERNEL); fw_name_size,
GFP_KERNEL);
if (!priv->adsp_fw_name) if (!priv->adsp_fw_name)
goto wqueue; goto wqueue;
strlcpy(priv->adsp_fw_name, adsp_fw_name_array[i], strlcpy(priv->adsp_fw_name, adsp_fw_name_array[i],
sizeof(priv->adsp_fw_name)); fw_name_size);
break; break;
} }
} }