From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from gateway30.websitewelcome.com ([192.185.197.25]:32325 "EHLO gateway30.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752417AbdHRQSl (ORCPT ); Fri, 18 Aug 2017 12:18:41 -0400 Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway30.websitewelcome.com (Postfix) with ESMTP id CF414588AC for ; Fri, 18 Aug 2017 10:55:48 -0500 (CDT) Subject: Re: [PATCH] media: venus: fix duplicated code for different branches To: Stanimir Varbanov , Mauro Carvalho Chehab References: <20170817231234.GA6674@embeddedgus> <99a35cad-9152-ec15-7843-de4668a9190f@linaro.org> Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org From: "Gustavo A. R. Silva" Message-ID: <96fa5d72-66d1-d28e-5d9f-d991e0c1ce83@embeddedor.com> Date: Fri, 18 Aug 2017 10:55:43 -0500 MIME-Version: 1.0 In-Reply-To: <99a35cad-9152-ec15-7843-de4668a9190f@linaro.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: Hi Stanimir, On 08/18/2017 02:52 AM, Stanimir Varbanov wrote: > Hi Gustavo, > > On 08/18/2017 02:12 AM, Gustavo A. R. Silva wrote: >> Refactor code in order to avoid identical code for different branches. >> >> This issue was detected with the help of Coccinelle. >> >> Addresses-Coverity-ID: 1415317 >> Signed-off-by: Gustavo A. R. Silva >> --- >> This code was reported by Coverity and it was tested by compilation only. >> Please, verify if this is an actual bug. > > Yes looks like copy/paste error, and yes it is a bug. > Thank you for reviewing it. >> >> drivers/media/platform/qcom/venus/helpers.c | 6 +----- >> 1 file changed, 1 insertion(+), 5 deletions(-) >> >> diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c >> index 5f4434c..8a5c467 100644 >> --- a/drivers/media/platform/qcom/venus/helpers.c >> +++ b/drivers/media/platform/qcom/venus/helpers.c >> @@ -240,11 +240,7 @@ static void return_buf_error(struct venus_inst *inst, >> { >> struct v4l2_m2m_ctx *m2m_ctx = inst->m2m_ctx; >> >> - if (vbuf->vb2_buf.type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) >> - v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf); >> - else >> - v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf); > > the correct fix must replace the second v4l2_m2m_src_* with v4l2_m2m_dst_*. > I'll send a patch to fix this bug shortly >> - >> + v4l2_m2m_src_buf_remove_by_buf(m2m_ctx, vbuf); >> v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR); >> } >> >> > Thanks! -- Gustavo A. R. Silva