[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: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c
index dad41a6af42ee505b570d845ad74da4024c647d3..b83c5b8ddccb5cd4a81d988a4406dd2433a7c066 100644 (file)
--- a/drivers/media/platform/qcom/venus/hfi_cmds.c
+++ b/drivers/media/platform/qcom/venus/hfi_cmds.c
@@ -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);