From patchwork Mon May 10 10:22:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 433136 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2810960jao; Mon, 10 May 2021 05:52:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvKH8HYe70HroluKIWp/ZBv+o2AN/xMOcLHytlVLBfB82BX5FpPWhFWyrgrkGXKNq/Wi66 X-Received: by 2002:aa7:cd4d:: with SMTP id v13mr29165128edw.218.1620651147078; Mon, 10 May 2021 05:52:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620651147; cv=none; d=google.com; s=arc-20160816; b=iT439TOUQdUAPRAnUFZsYKcCl60W54aFwFURHb7+zseKdhbyyzi1JnJbO+6BHZ8KJ1 YU39AMuP//yPzl/qubCVhQE6lVdJGtAVYN895ubI3b6LWJkvAGgytAYJBWr1HT7ntkO1 dA5G5hAEiou4bSTK+PTCJiFgjsauREz9UUHY6q++MsRrTZwINIBbA2vkqlvgcSHzYuIt HkeRKgAKcRE5LrQ8qHZ7AR1s+kST9t9Pj82lHwyzGRTVSEUCoqfcCD+/2jdu775VBkCs fa38nV4w2R1ThWYUPF3GeZ11JD3VeW8driKdAxT3lJ9Slz4wUxqObEhwoHSLeLmloNLR aW6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NED1xHJBa1Y6x/A1xitzemOebE2515QZegGQsj9hKQA=; b=NGdoKX48Wjn4CvKlD3BCLRwhPXHLBZONaD9CBaAgj0T2pTvFXwdWf7pdShfMsse6wc rvliUhSuqlnJpwELdWUI2fUvjuJNq/HxjZmJlJgt9j4u3gNAGZ3mspdnqEZ/xiVbXZOq 7De9wwuuRdXCDlkvqID5+crhE8DHkVcGsL7m/D4Za0tX+ZnET/7P02tUHH8VA6nmS1mW gFDp85oEU1XAFb11lfBTEDdaFlUeblXkQAhzOgbFvYzy87xWcf9M4ePvNxDHrD/wQMmv quBZ/gmpIZ7Efn6Lk/Ep1MybYjE8TQ6wKyI1noub/mEu6SPCom5QUbuhaj6pZHN+e2r3 dFXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ues1f8uf; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r17si13500365edw.273.2021.05.10.05.52.23; Mon, 10 May 2021 05:52:27 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ues1f8uf; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239265AbhEJL0M (ORCPT + 12 others); Mon, 10 May 2021 07:26:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:34826 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237992AbhEJLQn (ORCPT ); Mon, 10 May 2021 07:16:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BC1E361466; Mon, 10 May 2021 11:11:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620645115; bh=1Py9AC84fZSZ852glHoxKXuPrgezpssZMNhLsw5PGPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ues1f8ufrLI0ptxaRNP8EoYtI+sjf3DJGInL90B1pkws0dAtXW0ArBE0CM1XvLcN+ C0+D2HJBU//yyjR4KHpDdSCaIluy0OcZtcLEK6n+DdojTD3fMD9LMNiHjBEcY5VYb3 jph3WrHgogNa04Dj7D00OJ4sD1vUK7tDTssmAMdU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stanimir Varbanov , Bryan ODonoghue , Mauro Carvalho Chehab Subject: [PATCH 5.12 358/384] media: venus: hfi_parser: Check for instance after hfi platform get Date: Mon, 10 May 2021 12:22:27 +0200 Message-Id: <20210510102026.557828201@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stanimir Varbanov 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 Tested-by: Bryan O'Donoghue Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/qcom/venus/hfi_parser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- 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 ve 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);