[PATCH v10 12/18] media: venus: helpers: fix variable dereferenced before check

From: Stanimir Varbanov
Date: Mon Jun 12 2017 - 12:31:38 EST


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

drivers/media/platform/qcom/venus/helpers.c:157
load_per_instance() warn: variable dereferenced before check
'inst' (see line 153)

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@xxxxxxxxxx>
---
drivers/media/platform/qcom/venus/helpers.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
index f777ef80b941..5f4434c0a8f1 100644
--- a/drivers/media/platform/qcom/venus/helpers.c
+++ b/drivers/media/platform/qcom/venus/helpers.c
@@ -150,14 +150,12 @@ static int intbufs_free(struct venus_inst *inst)

static u32 load_per_instance(struct venus_inst *inst)
{
- u32 w = inst->width;
- u32 h = inst->height;
u32 mbs;

if (!inst || !(inst->state >= INST_INIT && inst->state < INST_STOP))
return 0;

- mbs = (ALIGN(w, 16) / 16) * (ALIGN(h, 16) / 16);
+ mbs = (ALIGN(inst->width, 16) / 16) * (ALIGN(inst->height, 16) / 16);

return mbs * inst->fps;
}
--
2.7.4