From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C852A57C9F for ; Sat, 23 Aug 2025 04:50:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755924621; cv=none; b=qjhZtSrl54JJsUlp0AeZWJTh29RRkMDeEBHpHvc0SjddQiCDm0xnAhq5gUWMCu/9WJVpDCqk2z7dwgp0NMLeGwcu0f7A6rwnjdRCDZ/Ot3bqfJu6DFdi1MMiycjSiqBou+7ypBMsFsO4xgNHKtT5pzFAPqZfE+PDYhV880xnhC8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755924621; c=relaxed/simple; bh=ZjYgCdcTHsomim5R6+I6KoUxyuedS0Za2Cq2gJqWP0s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gy3KJVZsAlePnavapT/egvX6h5dlxFJRzrkrDMxVm6EKnfR0LL1NdoTG0djFsQXRHVxrks5VPi8L0NHscLqjNhvUgBFb2WAqx5SIYl7w3An1ss1QCdYD2puufdYMUwqsaUOdIsB2Oa3Yaz42TN4+KdLGfwnbXMspklpjSjdJY5g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Dnbg+a2j; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Dnbg+a2j" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B863AC4CEE7; Sat, 23 Aug 2025 04:50:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755924621; bh=ZjYgCdcTHsomim5R6+I6KoUxyuedS0Za2Cq2gJqWP0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dnbg+a2jj7diYhAW2sFkYMATsznlglTlBgEUCwzOhzLPDx+PSkeXLBiTMve6hqZpq DSnfrY7mLi2FNSku0KCMh+7+nefvtOITCHdZJGYDgWS074l8OgirJXMfj3/F5hLg15 EiZPXZSg84Dht8e2P0zLswxeg9Qc5a+rSUzjzGnKuK8wiusyzOtCoOwTyw/CYvA9Zo EX8VO6HtVgUfUF4Q3C76BZhxAJNrG1rRLx0SsUZTOLxRIBCXan4Lg1it9inUokIL6m ouawCljgrk2A+s8ZxEv5XwrxF5RFSOfUpYm153Q7fDi00lUsimR8JrsIqR3EJXArNO ZXNbtpB1qKneQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Vladimir Zapolskiy , Bryan O'Donoghue , Bryan O'Donoghue , Hans Verkuil , Sasha Levin Subject: [PATCH 5.4.y] media: qcom: camss: cleanup media device allocated resource on error path Date: Sat, 23 Aug 2025 00:50:18 -0400 Message-ID: <20250823045018.1878034-1-sashal@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <2025082156-galvanize-reply-99cc@gregkh> References: <2025082156-galvanize-reply-99cc@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Vladimir Zapolskiy [ Upstream commit 69080ec3d0daba8a894025476c98ab16b5a505a4 ] A call to media_device_init() requires media_device_cleanup() counterpart to complete cleanup and release any allocated resources. This has been done in the driver .remove() right from the beginning, but error paths on .probe() shall also be fixed. Fixes: a1d7c116fcf7 ("media: camms: Add core files") Cc: stable@vger.kernel.org Signed-off-by: Vladimir Zapolskiy Reviewed-by: Bryan O'Donoghue Signed-off-by: Bryan O'Donoghue Signed-off-by: Hans Verkuil [ err_genpd_cleanup => err_cleanup ] Signed-off-by: Sasha Levin --- drivers/media/platform/qcom/camss/camss.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c index 2db9229d5601..adf3de3e017f 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -888,7 +888,7 @@ static int camss_probe(struct platform_device *pdev) ret = v4l2_device_register(camss->dev, &camss->v4l2_dev); if (ret < 0) { dev_err(dev, "Failed to register V4L2 device: %d\n", ret); - goto err_cleanup; + goto err_media_device_cleanup; } ret = camss_register_entities(camss); @@ -945,6 +945,8 @@ static int camss_probe(struct platform_device *pdev) camss_unregister_entities(camss); err_register_entities: v4l2_device_unregister(&camss->v4l2_dev); +err_media_device_cleanup: + media_device_cleanup(&camss->media_dev); err_cleanup: v4l2_async_notifier_cleanup(&camss->notifier); err_free: -- 2.50.1