From patchwork Tue Mar 23 11:28:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 12157395 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0494C433E0 for ; Tue, 23 Mar 2021 11:21:02 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C84D619A0 for ; Tue, 23 Mar 2021 11:21:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C84D619A0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC: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=U99lMUYFVlK/OdqXvdfz7H63YwRY5z+R+Zf5ma/Q+I8=; b=nPI2Tl0RIvv7qXLUmjV1RAYgwD rDBBBC/IVNQhP27Itq72wSNiAmfXuJO5jv5LIXdXvutfTLzkV5xogsJvJH0wjIstFG3WZgllPMZKd KVjcrXYiOas9cLp11FBamnC65EY94DH5A7EKxTz4ERu48a6DnoGq9YCkyPrXkRMvAbthH3C2kPelb MVc3X1MNIQq5qWCk6BIqNcoiKS7c+S9OLZkvN8hkjNNHGYvZBBlPEdlBL6Ap/TOm7++VuUBYtAX4a +WJpTe+HDLREvZiXkTo6pzDN9AKu+SfTI2dou/k7xjEXQvu/NsiheV+P/0L4CZCnbkWCHJplCZgDN GD73DhJw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lOf4A-00EhVj-Vj; Tue, 23 Mar 2021 11:19:19 +0000 Received: from szxga05-in.huawei.com ([45.249.212.191]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lOf45-00EhUs-Rn for linux-arm-kernel@lists.infradead.org; Tue, 23 Mar 2021 11:19:17 +0000 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4F4TNQ5x8jzwQ8Z; Tue, 23 Mar 2021 19:17:10 +0800 (CST) Received: from localhost.localdomain (10.175.102.38) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.498.0; Tue, 23 Mar 2021 19:18:59 +0800 From: 'w00385741 To: , Mirela Rabulea , "Mauro Carvalho Chehab" , Shawn Guo , "Sascha Hauer" CC: , , , Hulk Robot Subject: [PATCH -next] media: imx-jpeg: Fix error return code in mxc_jpeg_probe() Date: Tue, 23 Mar 2021 11:28:55 +0000 Message-ID: <20210323112855.1016779-1-weiyongjun1@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.102.38] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210323_111914_201966_3972DF0C X-CRM114-Status: UNSURE ( 9.74 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Wei Yongjun Fix to return negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: 2db16c6ed72c ("media: imx-jpeg: Add V4L2 driver for i.MX8 JPEG Encoder/Decoder") Reported-by: Hulk Robot Signed-off-by: Wei Yongjun Reviewed-by: Mirela Rabulea --- drivers/media/platform/imx-jpeg/mxc-jpeg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/imx-jpeg/mxc-jpeg.c index 2d29558f1864..70b9b61fbf88 100644 --- a/drivers/media/platform/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/imx-jpeg/mxc-jpeg.c @@ -2022,12 +2022,14 @@ static int mxc_jpeg_probe(struct platform_device *pdev) jpeg->m2m_dev = v4l2_m2m_init(&mxc_jpeg_m2m_ops); if (IS_ERR(jpeg->m2m_dev)) { dev_err(dev, "failed to register v4l2 device\n"); + ret = PTR_ERR(jpeg->m2m_dev); goto err_m2m; } jpeg->dec_vdev = video_device_alloc(); if (!jpeg->dec_vdev) { dev_err(dev, "failed to register v4l2 device\n"); + ret = -ENOMEM; goto err_vdev_alloc; } if (mode == MXC_JPEG_ENCODE)