Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b2e6488 authored by Stanimir Varbanov's avatar Stanimir Varbanov Committed by Mauro Carvalho Chehab
Browse files

[media] media: venus: hfi_cmds: fix variable dereferenced before check 



This fixes a warning found when building the driver with gcc7:

drivers/media/platform/qcom/venus/hfi_cmds.c:415
pkt_session_set_property_1x() warn: variable dereferenced before
check 'pkt' (see line 412)
drivers/media/platform/qcom/venus/hfi_cmds.c:1177
pkt_session_set_property_3xx() warn: variable dereferenced before
check 'pkt' (see line 1174)

Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 8a5aebf1

drivers/media/platform/qcom/venus/hfi_cmds.c

+6 −2
Original line number Diff line number Diff line
@@ -409,12 +409,14 @@ static int pkt_session_get_property_1x(struct hfi_session_get_property_pkt *pkt, 
static int pkt_session_set_property_1x(struct hfi_session_set_property_pkt *pkt,

				       void *cookie, u32 ptype, void *pdata)

{

	void *prop_data = &pkt->data[1];

	void *prop_data;

	int ret = 0;



	if (!pkt || !cookie || !pdata)

		return -EINVAL;



	prop_data = &pkt->data[1];



	pkt->shdr.hdr.size = sizeof(*pkt);

	pkt->shdr.hdr.pkt_type = HFI_CMD_SESSION_SET_PROPERTY;

	pkt->shdr.session_id = hash32_ptr(cookie);
@@ -1171,12 +1173,14 @@ static int 
pkt_session_set_property_3xx(struct hfi_session_set_property_pkt *pkt,

			     void *cookie, u32 ptype, void *pdata)

{

	void *prop_data = &pkt->data[1];

	void *prop_data;

	int ret = 0;



	if (!pkt || !cookie || !pdata)

		return -EINVAL;



	prop_data = &pkt->data[1];



	pkt->shdr.hdr.size = sizeof(*pkt);

	pkt->shdr.hdr.pkt_type = HFI_CMD_SESSION_SET_PROPERTY;

	pkt->shdr.session_id = hash32_ptr(cookie);