[PATCH next] media: iris: fix error code in iris_load_fw_to_memory()

Dan Carpenter posted 1 patch 10 months ago
drivers/media/platform/qcom/iris/iris_firmware.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
[PATCH next] media: iris: fix error code in iris_load_fw_to_memory()
Posted by Dan Carpenter 10 months ago
Return -ENOMEM if memremap() fails.  Don't return success.

Fixes: d19b163356b8 ("media: iris: implement video firmware load/unload")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
 drivers/media/platform/qcom/iris/iris_firmware.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/qcom/iris/iris_firmware.c b/drivers/media/platform/qcom/iris/iris_firmware.c
index 7c493b4a75db..f1b5cd56db32 100644
--- a/drivers/media/platform/qcom/iris/iris_firmware.c
+++ b/drivers/media/platform/qcom/iris/iris_firmware.c
@@ -53,8 +53,10 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name)
 	}
 
 	mem_virt = memremap(mem_phys, res_size, MEMREMAP_WC);
-	if (!mem_virt)
+	if (!mem_virt) {
+		ret = -ENOMEM;
 		goto err_release_fw;
+	}
 
 	ret = qcom_mdt_load(dev, firmware, fw_name,
 			    pas_id, mem_virt, mem_phys, res_size, NULL);
-- 
2.47.2
Re: [PATCH next] media: iris: fix error code in iris_load_fw_to_memory()
Posted by Dikshita Agarwal 10 months ago

On 2/17/2025 1:38 PM, Dan Carpenter wrote:
> Return -ENOMEM if memremap() fails.  Don't return success.
> 
> Fixes: d19b163356b8 ("media: iris: implement video firmware load/unload")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
>  drivers/media/platform/qcom/iris/iris_firmware.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/qcom/iris/iris_firmware.c b/drivers/media/platform/qcom/iris/iris_firmware.c
> index 7c493b4a75db..f1b5cd56db32 100644
> --- a/drivers/media/platform/qcom/iris/iris_firmware.c
> +++ b/drivers/media/platform/qcom/iris/iris_firmware.c
> @@ -53,8 +53,10 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name)
>  	}
>  
>  	mem_virt = memremap(mem_phys, res_size, MEMREMAP_WC);
> -	if (!mem_virt)
> +	if (!mem_virt) {
> +		ret = -ENOMEM;
>  		goto err_release_fw;
> +	}>
>  	ret = qcom_mdt_load(dev, firmware, fw_name,
>  			    pas_id, mem_virt, mem_phys, res_size, NULL);

Thanks for the fix.
Reviewed-by: Dikshita Agarwal <quic_dikshita@quicinc.com>

Thanks,
Dikshita