Re: [PATCH 1/2] soc: qcom: rmtfs: fix error handling reading qcom,vmid

From: Konrad Dybcio
Date: Mon Mar 06 2023 - 05:17:25 EST




On 5.03.2023 11:32, Luca Weiss wrote:
> 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@xxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>

Konrad
> drivers/soc/qcom/rmtfs_mem.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/soc/qcom/rmtfs_mem.c b/drivers/soc/qcom/rmtfs_mem.c
> index 9d59ad509a5c7..218397ab0c36f 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,
>