Skip to contentSkip to conversation

media: venus: hfi: fix return value check in sys_get_prop_image_version()

PATCH In review Zhen Lei 2 participants 2 messages Jul 7, 2021

Subsystems (4)
lore
Share & tools
lore

Zhen Lei

author
#0 lore raw

PATCH 1/1 media: venus: hfi: fix return value check in sys_get_prop_image_version()

In case of error, the function qcom_smem_get() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR().

Fixes d566e78dd6af ("media: venus : hfi: add venus image info into smem")
---
 drivers/media/platform/qcom/venus/hfi_msgs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/qcom/venus/hfi_msgs.c +1 -1
index d9fde66f6fa8..9a2bdb002edc 100644
@@ -261,7 +261,7 @@ sys_get_prop_image_version(struct device *dev,
 
 	smem_tbl_ptr = qcom_smem_get(QCOM_SMEM_HOST_ANY,
 		SMEM_IMG_VER_TBL, &smem_blk_sz);
-	if (smem_tbl_ptr && smem_blk_sz >= SMEM_IMG_OFFSET_VENUS + VER_STR_SZ)
+	if (!IS_ERR(smem_tbl_ptr) && smem_blk_sz >= SMEM_IMG_OFFSET_VENUS + VER_STR_SZ)
 		memcpy(smem_tbl_ptr + SMEM_IMG_OFFSET_VENUS,
 		       img_ver, VER_STR_SZ);
 }
Signature · 1 line
2.25.1