diff mbox series

[5.15,43/72] reset: renesas: Fix Runtime PM usage

Message ID	20220110071823.015359869@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Heiner Kallweit <hkallweit1@gmail.com>, Biju Das <biju.das.jz@bp.renesas.com>, Philipp Zabel <p.zabel@pengutronix.de> Subject: [PATCH 5.15 43/72] reset: renesas: Fix Runtime PM usage Date: Mon, 10 Jan 2022 08:23:20 +0100 Message-Id: <20220110071823.015359869@linuxfoundation.org> In-Reply-To: <20220110071821.500480371@linuxfoundation.org> References: <20220110071821.500480371@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.15,02/72] selftests: x86: fix [-Wstringop-overread] warn in test_process_vm_readv() [5.15,04/72] tracing: Tag trace_percpu_buffer as a percpu pointer [5.15,06/72] ieee802154: atusb: fix uninit value in atusb_set_extended_addr [5.15,07/72] i40e: Fix to not show opcode msg on unsuccessful VF MAC change [5.15,10/72] Revert "net: usb: r8152: Add MAC passthrough support for more Lenovo Docks" [5.15,11/72] netrom: fix copying in user data in nr_setsockopt [5.15,15/72] sfc: The RX page_ring is optional [5.15,17/72] i40e: Fix for displaying message regarding NVM version [5.15,18/72] i40e: Fix incorrect netdevs real number of RX/TX queues [5.15,21/72] ipv4: Check attribute length for RTA_FLOW in multipath route [5.15,23/72] ipv6: Check attribute length for RTA_GATEWAY when deleting multipath route [5.15,24/72] lwtunnel: Validate RTA_ENCAP_TYPE attribute length [5.15,26/72] sctp: hold endpoint before calling cb in sctp_transport_lookup_process [5.15,28/72] sch_qfq: prevent shift-out-of-bounds in qfq_init_qdisc [5.15,29/72] net: ena: Fix undefined state when tx request id is out of bounds [5.15,31/72] net: ena: Fix error handling when calculating max IO queues number [5.15,33/72] EDAC/i10nm: Release mdev/mbase when failing to detect HBM [5.15,36/72] cgroup: Allocate cgroup_file_ctx for kernfs_open_file->priv [5.15,37/72] cgroup: Use open-time cgroup namespace for process migration perm checks [5.15,39/72] i2c: mpc: Avoid out of bounds memory access [5.15,43/72] reset: renesas: Fix Runtime PM usage [5.15,44/72] rndis_host: support Hytera digital radios [5.15,46/72] net ticp:fix a kernel-infoleak in __tipc_sendmsg() [5.15,47/72] phonet: refcount leak in pep_sock_accep [5.15,51/72] ipv6: Continue processing multipath route even if gateway attribute is invalid [5.15,53/72] auxdisplay: charlcd: checking for pointer reference before dereferencing [5.15,55/72] drm/amd/pm: Fix xgmi link control on aldebaran [5.15,60/72] atlantic: Fix buff_ring OOB in aq_ring_rx_clean [5.15,61/72] drm/amd/pm: skip setting gfx cgpg in the s0ix suspend-resume [5.15,63/72] drm/amdgpu: put SMU into proper state on runpm suspending for BOCO capable platform [5.15,64/72] mISDN: change function names to avoid conflicts [5.15,65/72] drm/amd/display: fix B0 TMDS deepcolor no dislay issue [5.15,67/72] ipv6: raw: check passed optlen before reading [5.15,68/72] userfaultfd/selftests: fix hugetlb area allocations [5.15,71/72] Revert "drm/amdgpu: stop scheduler when calling hw_fini (v2)"

Commit Message

Greg KH Jan. 10, 2022, 7:23 a.m. UTC

From: Heiner Kallweit <hkallweit1@gmail.com>

commit 92c959bae2e54ba1e2540ba5f813f7752bd76be1 upstream.

If pm_runtime_resume_and_get() fails then it returns w/o the RPM usage
counter being incremented. In this case call pm_runtime_put() in
remove() will result in a usage counter imbalance. Therefore check the
return code of pm_runtime_resume_and_get() and bail out in case of error.

Fixes: bee08559701f ("reset: renesas: Add RZ/G2L usbphy control driver")
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/ec24e13f-0530-b091-7a08-864577b9b3be@gmail.com
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/reset/reset-rzg2l-usbphy-ctrl.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff mbox series

Patch

--- a/drivers/reset/reset-rzg2l-usbphy-ctrl.c
+++ b/drivers/reset/reset-rzg2l-usbphy-ctrl.c
@@ -137,7 +137,12 @@  static int rzg2l_usbphy_ctrl_probe(struc
 	dev_set_drvdata(dev, priv);
 
 	pm_runtime_enable(&pdev->dev);
-	pm_runtime_resume_and_get(&pdev->dev);
+	error = pm_runtime_resume_and_get(&pdev->dev);
+	if (error < 0) {
+		pm_runtime_disable(&pdev->dev);
+		reset_control_assert(priv->rstc);
+		return dev_err_probe(&pdev->dev, error, "pm_runtime_resume_and_get failed");
+	}
 
 	/* put pll and phy into reset state */
 	spin_lock_irqsave(&priv->lock, flags);