From patchwork Mon Jul 17 20:09:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 121593 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1332096vqt; Mon, 17 Jul 2023 13:36:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlFq7ErzhOqoq/N+RnoEguFkmYcNNnYTC4ir4It2UXYZLAAxEpdMczEn+yaMfKDmkWuP0qqS X-Received: by 2002:a17:906:54:b0:994:4f1c:d769 with SMTP id 20-20020a170906005400b009944f1cd769mr8619905ejg.3.1689626195467; Mon, 17 Jul 2023 13:36:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689626195; cv=none; d=google.com; s=arc-20160816; b=zDYpmGbTb+C16VcCgkT2lTJcRhbN7R6PcLvL76GBXMauy6DgEUx9zgeDQTzIhfJ/Mr Tipcpa9E6Mdh+bhFS3azD3X0zhfYDmht9oHyWn0Nh3lSrVucdlmj3Lkzqom2KsMN8Bi1 s5zf7wFrqNxTpu/ViFX774TBnnKBiqL4kyATiYsu55KdB3W4nymxj6p3mr724ROSXU1V pbKIp1nLV+gm8gr9n08vZR1uv7dfRQPtoumCNiETNJ9hW4ymfNgeQRIlM+OjpRQwDzCW 7yRTaKy57n/fi+AyRgwmePBRKfbMHSLIjQfnHnozV1iXj/aJxDLNPReClnB1zLCbWV6U h8Zw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=UEj0AXAxlyKrDR2T9dRAsXWpemXdwncxY2h++Qk+qQw=; fh=j+YVDXLw1ieo5i0od89lq/5Ej+XRH/QvGiQ5iDy4yu4=; b=x4HBrhQsYUJVuT6FYuVEamblki49OKZPOMfrULoMbfluQ7MTVeYO3hkm3XksLJhWNB M3YOw05CI9zgOUWtbW3BgvQG5iKGqoMaqzBFS8VNWUp45npQ99YxCF6xKS16gq91iii5 yX+oa68cIGQL1VH4KaY6AYdK7KLunaAfhtCZOtcdAhS04ouqR0WXv1YjsHe+aKfzFybs 7oOnPMncXw7qKNNQUoyKKpdMCERtQFBXMcxRsS4j4d/erHFqlgrqU8VxvL4wjdtJzND1 H0z8dSRaCm9MRgIo5an9T8V8v6qzB8hh9rnyjM2y9vOCUhtGs0n8vLHy7HOx3GMNj+sc gXWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=d5cNBpyc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q1-20020a170906678100b00992d347dc94si102388ejp.927.2023.07.17.13.36.11; Mon, 17 Jul 2023 13:36:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=d5cNBpyc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229708AbjGQUJa (ORCPT + 99 others); Mon, 17 Jul 2023 16:09:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229630AbjGQUJ3 (ORCPT ); Mon, 17 Jul 2023 16:09:29 -0400 Received: from smtp.smtpout.orange.fr (smtp-29.smtpout.orange.fr [80.12.242.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5D82E7 for ; Mon, 17 Jul 2023 13:09:27 -0700 (PDT) Received: from pop-os.home ([86.243.2.178]) by smtp.orange.fr with ESMTPA id LUX2q5vfabkI3LUX3qnKyX; Mon, 17 Jul 2023 22:09:26 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1689624566; bh=UEj0AXAxlyKrDR2T9dRAsXWpemXdwncxY2h++Qk+qQw=; h=From:To:Cc:Subject:Date; b=d5cNBpyckTzPUqzqnhq0Y8pnMXCGVib/3GQbOzMQQsYxZ3ZYKt+G4E2/m0JKWFX+e qqDGQBU3SKWwxg6+fc7iAiwf/ujP3ncKaZh5EqZ0NlrQbWfy0k6ZMAHR2alnc/RV0O BRWLayHoFfKe22+BCe+9ZH74Rp3Yb4VGTr//1QNai0xaOnpWocQub4BxIKf/4/XYQQ aC6q05JzSPNLdSdhUaYi7DjgHHxT1Idu1MjlUL6CW1hWdXd95uygiX+S50KeqRHdcM t5KbEAcOD6WglubNCuVqoWfi+MZ7NLw0gvaibiq0kYwspynZkdd5yCqTNi6bIdnZRC sbthVNZOAmuLA== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Mon, 17 Jul 2023 22:09:26 +0200 X-ME-IP: 86.243.2.178 From: Christophe JAILLET To: Tiffany Lin , Andrew-CT Chen , Yunfei Dong , Mauro Carvalho Chehab , Matthias Brugger , AngeloGioacchino Del Regno , Xiaoyong Lu , Nicolas Dufresne , Hans Verkuil Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH] media: mediatek: vcodec: Fix an error handling path in vdec_msg_queue_init() Date: Mon, 17 Jul 2023 22:09:19 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771701477214898309 X-GMAIL-MSGID: 1771701477214898309 All errors go to the error handling path, except this one. Be consistent and also branch to it. Fixes: 2f5d0aef37c6 ("media: mediatek: vcodec: support stateless AV1 decoder") Signed-off-by: Christophe JAILLET --- drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c b/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c index 04e6dc6cfa1d..c6cc2785e0e8 100644 --- a/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c +++ b/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c @@ -338,14 +338,16 @@ int vdec_msg_queue_init(struct vdec_msg_queue *msg_queue, err = mtk_vcodec_mem_alloc(ctx, &lat_buf->rd_mv_addr); if (err) { mtk_v4l2_err("failed to allocate rd_mv_addr buf[%d]", i); - return -ENOMEM; + err = -ENOMEM; + goto mem_alloc_err; } lat_buf->tile_addr.size = VDEC_LAT_TILE_SZ; err = mtk_vcodec_mem_alloc(ctx, &lat_buf->tile_addr); if (err) { mtk_v4l2_err("failed to allocate tile_addr buf[%d]", i); - return -ENOMEM; + err = -ENOMEM; + goto mem_alloc_err; } }