Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 481E63AE1A9; Mon, 17 Aug 2026 14:28:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786976938; cv=none; b=hBbHAdVG0bGg0q1K3fM5vrjX3ewK+rxZZk9cVqZFAFx09MZQNhyQUwz+aB9YmXsRQtEyTrXK7wvgKxYGtqddtmg3oVnsdwf8KcNxg3I9KYMLVOK+LL+CDo1/dnr6Znr5KjSXTAE1CmaOA3b1/ZAUbhsmaNa5o9J4Mw6pWdqybPs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786976938; c=relaxed/simple; bh=hXEnBE3kJ2lHP45hT7/GPWQ0rpMTLlIKYCr2kC/dnbY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PxkLcBX7gKkiOagTpCs7NJMKtDSLw6aWkpukQ9EHrw6vdsnoxiYcP86jyIHmwIreV53TOTYIght/KGH98mmkSKIZ8Z/eeJRfljTf1YRNjZNLtph7fYlUB4ZS7AHTaWKkhyVczSgGYHGb8eAWEsmxFBENmgozvzFDbYZEDzfshrk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Pw7kLlsW; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Pw7kLlsW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81A4F1F000E9; Mon, 17 Aug 2026 14:28:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786976937; bh=3dsk+KAN0SJWzhgkAzvr5rXDX5ltvlT4PiUJmHbBLxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Pw7kLlsWtpy24qqLgdkQlq83aomW/04P/fClXpkEN+XOe5TFvzjYLFuoSBoCbIZb5 itNsFD8MAen0x8nQK2uWEpV+IipnQ+bAX44dEQ1LPUgvmbrUHKOe31rYSZyxqXOrdw 210twfi9HJu/oxveIK+oNVn0EnEzVV6JIojuAqdQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Paul Kocialkowski , Ijae Kim , Myeonghun Pak , Nicolas Dufresne , Hans Verkuil Subject: [PATCH 5.15 157/456] media: cedrus: clean up media device on probe failure Date: Mon, 17 Aug 2026 15:29:07 +0200 Message-ID: <20260817132546.222048059@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260817132539.792407575@linuxfoundation.org> References: <20260817132539.792407575@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Myeonghun Pak commit 2c869b6969f3061cbbdab587f4c0a88bd7fc3cc9 upstream. cedrus_probe() initializes the media device before registering the video device, the media controller, and the media device. If any of those later steps fails, probe returns without calling media_device_cleanup(), so the media device internals initialized by media_device_init() are left behind. Add a media-device cleanup label to the probe unwind path and route video registration failures through it as well. Fixes: 50e761516f2b8c ("media: platform: Add Cedrus VPU decoder driver") Cc: stable@vger.kernel.org Reviewed-by: Paul Kocialkowski Co-developed-by: Ijae Kim Signed-off-by: Ijae Kim Signed-off-by: Myeonghun Pak Signed-off-by: Nicolas Dufresne Signed-off-by: Hans Verkuil Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/sunxi/cedrus/cedrus.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/staging/media/sunxi/cedrus/cedrus.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c @@ -422,7 +422,7 @@ static int cedrus_probe(struct platform_ ret = video_register_device(vfd, VFL_TYPE_VIDEO, 0); if (ret) { v4l2_err(&dev->v4l2_dev, "Failed to register video device\n"); - goto err_m2m; + goto err_media; } v4l2_info(&dev->v4l2_dev, @@ -448,7 +448,8 @@ err_m2m_mc: v4l2_m2m_unregister_media_controller(dev->m2m_dev); err_video: video_unregister_device(&dev->vfd); -err_m2m: +err_media: + media_device_cleanup(&dev->mdev); v4l2_m2m_release(dev->m2m_dev); err_v4l2: v4l2_device_unregister(&dev->v4l2_dev);