From: Stanimir Varbanov Date: Sun, 7 Mar 2021 11:17:27 +0000 (+0100) Subject: media: venus: hfi_parser: Check for instance after hfi platform get X-Git-Tag: v5.15~1266^2~112 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b5d8fd580caa898c6e1b8605c774f2517f786ab;p=platform%2Fkernel%2Flinux-starfive.git media: venus: hfi_parser: Check for instance after hfi platform get 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 Tested-by: Bryan O'Donoghue Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/qcom/venus/hfi_parser.c b/drivers/media/platform/qcom/venus/hfi_parser.c index ce23097..5b8389b 100644 --- a/drivers/media/platform/qcom/venus/hfi_parser.c +++ b/drivers/media/platform/qcom/venus/hfi_parser.c @@ -235,13 +235,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);