Skip to contentSkip to conversation

phy: renesas: rcar-gen3-usb2: disable runtime pm in case of failure

PATCH Applied Wang Li 2 participants 2 messages Nov 26, 2020 – Dec 5, 2020

Subsystems (3)
lore
Share & tools
lore

Wang Li

author
#0 lore raw

PATCH v2 1/1 phy: renesas: rcar-gen3-usb2: disable runtime pm in case of failure

pm_runtime_enable() will decrease power disable depth. Thus a pairing increment is needed on the error handling path to keep it balanced.

Fixes 5d8042e95fd4 ("phy: rcar-gen3-usb2: Add support for r8a77470")

---
Changelog:
v2
- Correct the commit message.

---
 drivers/phy/renesas/phy-rcar-gen3-usb2.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/phy/renesas/phy-rcar-gen3-usb2.c +4 -2
index e34e4475027c..2cb949f931b6 100644
@@ -656,8 +656,10 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
 	 */
 	pm_runtime_enable(dev);
 	phy_usb2_ops = of_device_get_match_data(dev);
-	if (!phy_usb2_ops)
-		return -EINVAL;
+	if (!phy_usb2_ops) {
+		ret = -EINVAL;
+		goto error;
+	}
 
 	mutex_init(&channel->lock);
 	for (i = 0; i < NUM_OF_PHYS; i++) {
Signature · 1 line
2.25.4
maintainer Applied
#1 lore raw
Quoted 2 lines · Wang Li

pm_runtime_enable() will decrease power disable depth. Thus a pairing increment is needed on the error handling path to keep it balanced.

Applied, thanks

Signature · 1 line
~Vinod