media: venus: hfi_parser: Check for instance after hfi platform get

commit 9b5d8fd580caa898c6e1b8605c774f2517f786ab upstream.

The inst function argument is != NULL only for Venus v1 and
we did not migrate v1 to a hfi_platform abstraction yet. So
check for instance != NULL only after hfi_platform_get returns
no error.

Fixes: e29929266be1 ("media: venus: Get codecs and capabilities from hfi platform")
Cc: stable@vger.kernel.org # v5.12
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/platform/qcom/venus/hfi_parser.c b/drivers/media/platform/qcom/venus/hfi_parser.c
index cb7645f88a46b086654a969b1cedf4280e1be7f9..5475879c26694a5b9b62df14e5ada8127a2ebe28 100644 (file)
--- a/drivers/media/platform/qcom/venus/hfi_parser.c
+++ b/drivers/media/platform/qcom/venus/hfi_parser.c
@@ -269,13 +269,13 @@ static int hfi_platform_parser(struct venus_core *core, struct venus_inst *inst)
        u32 enc_codecs, dec_codecs, count = 0;
        unsigned int entries;
 
-       if (inst)
-               return 0;
-
        plat = hfi_platform_get(core->res->hfi_version);
        if (!plat)
                return -EINVAL;
 
+       if (inst)
+               return 0;
+
        if (plat->codecs)
                plat->codecs(&enc_codecs, &dec_codecs, &count);