]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
media: iris: fix error code in iris_load_fw_to_memory()
authorDan Carpenter <dan.carpenter@linaro.org>
Mon, 17 Feb 2025 08:08:00 +0000 (11:08 +0300)
committerHans Verkuil <hverkuil@xs4all.nl>
Fri, 11 Apr 2025 11:29:06 +0000 (13:29 +0200)
Return -ENOMEM if memremap() fails.  Don't return success.

Fixes: d19b163356b8 ("media: iris: implement video firmware load/unload")
Cc: stable@vger.kernel.org
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
drivers/media/platform/qcom/iris/iris_firmware.c

index 7c493b4a75dbb2704af5043545b4e4ae8714e524..f1b5cd56db3225d0a97e07d3a63c24814deeba78 100644 (file)
@@ -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);