Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: iris: fix error code in iris_load_fw_to_memory()

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>

authored by

Dan Carpenter and committed by
Hans Verkuil
e68c3c50 bf462ef8

+3 -1
+3 -1
drivers/media/platform/qcom/iris/iris_firmware.c
··· 53 53 } 54 54 55 55 mem_virt = memremap(mem_phys, res_size, MEMREMAP_WC); 56 - if (!mem_virt) 56 + if (!mem_virt) { 57 + ret = -ENOMEM; 57 58 goto err_release_fw; 59 + } 58 60 59 61 ret = qcom_mdt_load(dev, firmware, fw_name, 60 62 pas_id, mem_virt, mem_phys, res_size, NULL);