From patchwork Wed Mar 6 06:15:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Courbot X-Patchwork-Id: 10840413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B77EA139A for ; Wed, 6 Mar 2019 06:15:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A03982CE3A for ; Wed, 6 Mar 2019 06:15:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 943332CE3D; Wed, 6 Mar 2019 06:15:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 446052CE3A for ; Wed, 6 Mar 2019 06:15:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=fbLlVe/xrmrCVbfIgleBVghlD/rLFFC2E+l2XViKpMM=; b=P+YZqhM6x6fHUl OKfNtlf1YDMV+39cSn9N7EPtGIS2uN8BXVxHHFg+HvwuxfWnC9h2/rSl6/237XN8qxNT2OGJabvdV YGGR97frdpYyPz8OoIYce+x+n7DFtVWA/gMG/2XQGXymVkFLqFTAXJvnK2U8bxN54V45rTEsTsAj9 6HtxbJsrSav+V6/oghsfpZjB24vM8VUleAQnf+9Twg/qTz5K5V2cx6BoeMZBMzxpRK5iNKSXgLr0c +2Bg8VLaaUPkNnIwDErysJKTn28peg9Ij+lRMR8nNt8skgBErX9bwX4AreemgEJmm+HIbX9s1jHTT LuJCZxwyNNeUG8BMyHgA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1Ppm-00018r-Vs; Wed, 06 Mar 2019 06:15:18 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1Ppi-00018T-Je for linux-mediatek@lists.infradead.org; Wed, 06 Mar 2019 06:15:16 +0000 Received: by mail-pf1-x441.google.com with SMTP id n22so7690603pfa.3 for ; Tue, 05 Mar 2019 22:15:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+yKqYoiAT0Tmmo3srRdNf++4aPyW5uQd7VuC7jZ4Ae0=; b=SrCrQLvMzMrdQBfMF2hf4vL7DVph7K8/C4/HascSXSHP6hPJb9pqkxZdirMYWrBTvD 3beFbrpMwjOAN3puKSi5yLF46/XQ0+DbO3s19GIWDgdw7c6ZNRwX3SIyPL6GCgo5RNFq crJ/I3ky1uzcOoLBHNZnC77/4xuKyt7mbdUQ4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+yKqYoiAT0Tmmo3srRdNf++4aPyW5uQd7VuC7jZ4Ae0=; b=FgzNPNkOIxFVcg+WFmM5+zpDr2urWcBKOLDORSROO5kjynrxWg5CGXuDFO6MXFV4Wa IXt8P193USdkkonBxJ2sBMvDeYuGvAIz0fEJ7gzj9+iiyk1qZ7HIBj+OFiOP09/fxKmF Ks43V01FCkaxCjzu9Z+Vgp/gzpOJnnLWYnNQ4CcLahh/Oaf5e4Jv5jQejyntQc9EE6by 23tUHJPtZvwr0/lEeTak5OoyFWpswj5V/MkbnAq5dZAaj2OI1yQrXWV7HG8mdXQl/R58 Zf+DzZo3OFcSzphCWzboOO8DvsoLeN/0Nm4zNmxxTs2g+B5oHEyrwqGd4sU91aEeI+pK QCbA== X-Gm-Message-State: APjAAAXx8Djzih2Nb74joI2dykljV3AP40l7lrfmiGu5iG13SxbZSiXp 3NFFVS8TsFb+LfdgugzhaKyFOA== X-Google-Smtp-Source: APXvYqyFrfyPokVCZ0UNRCvO3ZJgdZKDC9H1a48lxdMOuEltaAY3I7LKkXeuE3ikzh2FOmbi+zOKnQ== X-Received: by 2002:a17:902:6b08:: with SMTP id o8mr5219821plk.105.1551852913262; Tue, 05 Mar 2019 22:15:13 -0800 (PST) Received: from acourbot.tok.corp.google.com ([2401:fa00:4:4:9712:8cf1:d0f:7d33]) by smtp.gmail.com with ESMTPSA id k9sm1511981pfc.57.2019.03.05.22.15.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 22:15:12 -0800 (PST) From: Alexandre Courbot To: Ezequiel Garcia , Tiffany Lin , Andrew-CT Chen , Mauro Carvalho Chehab Subject: [PATCH] media: mtk-vcodec: fix access to vb2_v4l2_buffer struct Date: Wed, 6 Mar 2019 15:15:02 +0900 Message-Id: <20190306061502.126904-1-acourbot@chromium.org> X-Mailer: git-send-email 2.21.0.352.gf09ad66450-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190305_221514_694068_A2303B4D X-CRM114-Status: UNSURE ( 9.59 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Alexandre Courbot , linux-media@vger.kernel.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 0650a91499e0 ("media: mtk-vcodec: Correct return type for mem2mem buffer helpers") fixed the return types for mem2mem buffer helper functions, but omitted two occurrences that are accessed in the mtk_v4l2_debug() macro. These only trigger compiler errors when DEBUG is defined. Fixes: 0650a91499e0 ("media: mtk-vcodec: Correct return type for mem2mem buffer helpers") Signed-off-by: Alexandre Courbot --- drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c index d022c65bb34c..a85c7cc8328e 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c @@ -1158,7 +1158,7 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb) src_mem.size = (size_t)src_buf->planes[0].bytesused; mtk_v4l2_debug(2, "[%d] buf id=%d va=%p dma=%pad size=%zx", - ctx->id, src_buf->index, + ctx->id, src_buf->vb2_buf.index, src_mem.va, &src_mem.dma_addr, src_mem.size); @@ -1182,7 +1182,7 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb) } mtk_v4l2_debug(ret ? 0 : 1, "[%d] vdec_if_decode() src_buf=%d, size=%zu, fail=%d, res_chg=%d", - ctx->id, src_buf->index, + ctx->id, src_buf->vb2_buf.index, src_mem.size, ret, res_chg); return; }