Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3721624pxb; Mon, 24 Jan 2022 16:18:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJzRoLriBedlpZEc0OAy2E+ptG5ZdSHRm7/DITQRXMwRxb7M38HZI7nG6C0OajqVsD8khrH0 X-Received: by 2002:a17:90b:1e0e:: with SMTP id pg14mr677678pjb.235.1643069930645; Mon, 24 Jan 2022 16:18:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643069930; cv=none; d=google.com; s=arc-20160816; b=so1LjTAyIRjKeZCbHIs3vOqMWVZi7cSzM/qc+NNdEnDfYZeB2h3iA6ElnNJlIDeakU H6G/1yUoYzzXY87x9sbfKJYl7wxfL2zlokGMKbjrgRwVsqmpZ9nD8mlv1LD9qvPSlZ/H V0hC83HDscoe/9ziZi/jKSjjuO/QXZmRHG5KVxPGGLBwVwxjyde5nAyeox8qD9cGrJCO IZSSFoZFLTloENxjuejZBuAJ7luvbUzzZ4IM59cjVutumqvjtIft3SS7YbGXO6Rd6jTD 0QfNkSKjJ1mKm4yTRllG27DXDjJxjgeYTUPt/DEFxrUfORNm+5G0kM3j7y5eiBW9H228 L3eA== 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=l1ivcihL5AZcN8STbLiRY0kXv6VoDdgUTihLbNmqyfo=; b=Fdw6RE6xNqNcoMQE2wJhK07c5QUCZPvr7fTIVSQTNmNBkbjpAl7m2dqFtGgfD52ItY IQ/JFk9YRVhmPyKBBL+wUP+38sR25jwmntRTs/cheQ57ylU5brg6YPWJ0nOWYi/ebg3i Qwl0P9gCiK0IWhQU941NzeUqULPBeXimOBOpv9jlc04R6v14iHmTAO87mfP7X3ndZpVG V7JkzEzwZCmPvvr7LFP477tTR7yrOWoGhI+MRwmTDz7J507aajf35jEBDoP59XNajxaS CR40vqldh0cUA0dG2E8Q/QwazS0yKlYan+qiOlPVbjPZZOmcK5JOn4G1pp+Imt7/OhAs DNzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JlHKJ2cD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 mq2si864453pjb.19.2022.01.24.16.18.38; Mon, 24 Jan 2022 16:18:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-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=JlHKJ2cD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S2372459AbiAYALc (ORCPT + 99 others); Mon, 24 Jan 2022 19:11:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356613AbiAXWjo (ORCPT ); Mon, 24 Jan 2022 17:39:44 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB7CFC05487D; Mon, 24 Jan 2022 13:02:39 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6CE4D61330; Mon, 24 Jan 2022 21:02:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F753C340E5; Mon, 24 Jan 2022 21:02:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643058158; bh=B5br9ewwZxFUbx8koaJI0fAcTbHZVutvSbyrlS9WXuc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JlHKJ2cDDhbNyK5OEOqBQ7OWI3nPDhdXqrfGL6mCXYu+0zsYLeyzQf3M80X/RbhSP RXtgByGrqkw8FvNGcXbc2lFmhBOGEmiN6CyZcRUesEH+AC2QwD09RPSJchDYdYSfA8 BgyS/MeLEQFwBW50typIyItsHguCXno2S52r+yt4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Tzung-Bi Shih , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.16 0191/1039] media: mtk-vcodec: Fix an error handling path in mtk_vcodec_probe() Date: Mon, 24 Jan 2022 19:33:00 +0100 Message-Id: <20220124184131.723405427@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184125.121143506@linuxfoundation.org> References: <20220124184125.121143506@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe JAILLET [ Upstream commit 615c6f28b9ad7efc9bfbef2cafc6a0c5bc0c21e0 ] In case of error the 'media_device_init()' call is not balanced by a corresponding 'media_device_cleanup()' call. Add it, when needed, as already done in the remove function. Fixes: 118add98f80e ("media: mtk-vcodec: vdec: add media device if using stateless api") Signed-off-by: Christophe JAILLET Acked-by: Tzung-Bi Shih Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c index e6e6a8203eebf..8277c44209b5b 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c @@ -358,6 +358,8 @@ err_media_reg: if (dev->vdec_pdata->uses_stateless_api) v4l2_m2m_unregister_media_controller(dev->m2m_dev_dec); err_reg_cont: + if (dev->vdec_pdata->uses_stateless_api) + media_device_cleanup(&dev->mdev_dec); destroy_workqueue(dev->decode_workqueue); err_event_workq: v4l2_m2m_release(dev->m2m_dev_dec); -- 2.34.1