diff options
| author | Luca Weiss <luca@z3ntu.xyz> | 2023-03-05 11:32:33 +0100 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2023-03-07 05:13:06 +0100 |
| commit | 947007419b60d5e06aa54b0f411c123db7f45a44 (patch) | |
| tree | 3b9835ced62696d5cde12e520ba52c6055bdb8eb /drivers/soc | |
| parent | soc: qcom: llcc: Fix slice configuration values for SC8280XP (diff) | |
| download | linux-947007419b60d5e06aa54b0f411c123db7f45a44.tar.xz linux-947007419b60d5e06aa54b0f411c123db7f45a44.zip | |
soc: qcom: rmtfs: fix error handling reading qcom,vmid
of_property_count_u32_elems returns a negative integer when an error
happens , but since the value was assigned to an unsigned integer, the
check never worked correctly. Also print the correct variable in the
error print, ret isn't used here.
Fixes: e656cd0bcf3d ("soc: qcom: rmtfs: Optionally map RMTFS to more VMs")
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230305-rmtfs-vmid-fix-v1-1-6a7206081602@z3ntu.xyz
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/rmtfs_mem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/soc/qcom/rmtfs_mem.c b/drivers/soc/qcom/rmtfs_mem.c index 2d3ee22b9249..f57756220198 100644 --- a/drivers/soc/qcom/rmtfs_mem.c +++ b/drivers/soc/qcom/rmtfs_mem.c @@ -176,7 +176,8 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev) struct reserved_mem *rmem; struct qcom_rmtfs_mem *rmtfs_mem; u32 client_id; - u32 num_vmids, vmid[NUM_MAX_VMIDS]; + u32 vmid[NUM_MAX_VMIDS]; + int num_vmids; int ret, i; rmem = of_reserved_mem_lookup(node); @@ -229,7 +230,7 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev) num_vmids = of_property_count_u32_elems(node, "qcom,vmid"); if (num_vmids < 0) { - dev_err(&pdev->dev, "failed to count qcom,vmid elements: %d\n", ret); + dev_err(&pdev->dev, "failed to count qcom,vmid elements: %d\n", num_vmids); goto remove_cdev; } else if (num_vmids > NUM_MAX_VMIDS) { dev_warn(&pdev->dev, |