From mboxrd@z Thu Jan 1 00:00:00 1970 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 C267F44AB62; Tue, 21 Jul 2026 22:04:58 +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=1784671499; cv=none; b=OtQHcQhbdavfAfc7eeKaffpnlaBsZoO0Cow5SJikrwUgXVazWeO2j3aeNJ4L0UbRlDkyp664gSAaT7iGX6b6ojIC7RaW7nK6AyMKCjwZcQqhRaPC633K+uG/Xlw8Nccdn7dlhAHsnpNmToF4sOOAi1VQT9ks7wdPGjkWB2I+n0o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784671499; c=relaxed/simple; bh=qNSi6rahCBnTkwVeALSCcwSSZ6QIBss69UquzbB8gL4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hL6bauwspxQ/d9t+8eVkowlYilrw3E5Up1PTpfTBjUfkWsqavIGUX0yxoIlxix+Ume7WWgOibfEdBIaD9yFt6w0iPseioVUJwANHmgtDZU0ESiLheRLjAu5K7hNXQFdZfePMwUlXFxaKxfPeMCuGMNt79L1rd72ECFJjns3FYn0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=eTlDIGmT; 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="eTlDIGmT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38C561F000E9; Tue, 21 Jul 2026 22:04:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784671498; bh=pGMR5HulpPSBh4BH8Hv0SeyX4w/IfbvI4HG7m3R/C94=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eTlDIGmTwdYFRI1cxy1ppOp5edqFIawjFXOr7TLojHxnGZYd16t6vSYtV1TmyGBP9 JnPd43Ps4geSAYEXDYyokzjN8NCV1Ruv4GLmjdgAxO3B2g0Ra+TMQ624PByj14Nxmw TfdhezTzgfBY7XCA3zXlTllMYVeEDH1Xct4PSkak= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Samuel Holland , Andrey Skvortsov , Paul Kocialkowski , Nicolas Dufresne , Hans Verkuil , Sasha Levin Subject: [PATCH 5.15 226/843] media: cedrus: Fix failure to clean up hardware on probe failure Date: Tue, 21 Jul 2026 17:17:41 +0200 Message-ID: <20260721152411.099496713@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152405.946368001@linuxfoundation.org> References: <20260721152405.946368001@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: Samuel Holland [ Upstream commit f0a22f1d602ed499a192284de5e811a73421f0c7 ] If V4L2 device fails to register, then SRAM still be claimed and as a result driver will not be able to probe again. cedrus 1c0e000.video-codec: Failed to claim SRAM cedrus 1c0e000.video-codec: Failed to probe hardware cedrus 1c0e000.video-codec: probe with driver cedrus failed with error -16 cedrus_hw_remove undoes everything that was previously done by cedrus_hw_probe, such as disabling runtime power management and releasing the claimed SRAM and reserved memory region. Signed-off-by: Samuel Holland Signed-off-by: Andrey Skvortsov Fixes: 50e761516f2b ("media: platform: Add Cedrus VPU decoder driver") Acked-by: Paul Kocialkowski Signed-off-by: Nicolas Dufresne Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/staging/media/sunxi/cedrus/cedrus.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c index b1755407547b6d..560ccdd40481a3 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c @@ -391,7 +391,7 @@ static int cedrus_probe(struct platform_device *pdev) ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev); if (ret) { dev_err(&pdev->dev, "Failed to register V4L2 device\n"); - return ret; + goto err_hw; } vfd = &dev->vfd; @@ -452,6 +452,8 @@ static int cedrus_probe(struct platform_device *pdev) v4l2_m2m_release(dev->m2m_dev); err_v4l2: v4l2_device_unregister(&dev->v4l2_dev); +err_hw: + cedrus_hw_remove(dev); return ret; } -- 2.53.0