From 9a8ad10c9f2e0925ff26308ec6756b93fc2f4977 Mon Sep 17 00:00:00 2001

From: Johan Hovold <johan+linaro@kernel.org>

Date: Tue, 4 Apr 2023 09:25:14 +0200

Subject: [PATCH] USB: dwc3: fix runtime pm imbalance on probe errors

Git-commit: 9a8ad10c9f2e0925ff26308ec6756b93fc2f4977

References: git-fixes

Patch-mainline: v6.4-rc1

Make sure not to suspend the device when probe fails to avoid disabling

clocks and phys multiple times.

Fixes: 328082376aea ("usb: dwc3: fix runtime PM in error path")

Cc: stable@vger.kernel.org      # 4.8

Cc: Roger Quadros <rogerq@ti.com>

Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>

Link: https://lore.kernel.org/r/20230404072524.19014-2-johan+linaro@kernel.org

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Oliver Neukum <oneukum@suse.com>

---

 drivers/usb/dwc3/core.c |   13 +++++--------

 1 file changed, 5 insertions(+), 8 deletions(-)

--- a/drivers/usb/dwc3/core.c

+++ b/drivers/usb/dwc3/core.c

@@ -1239,13 +1239,11 @@ static int dwc3_probe(struct platform_de

 	spin_lock_init(&dwc->lock);

+	pm_runtime_get_noresume(dev);

 	pm_runtime_set_active(dev);

 	pm_runtime_use_autosuspend(dev);

 	pm_runtime_set_autosuspend_delay(dev, DWC3_DEFAULT_AUTOSUSPEND_DELAY);

 	pm_runtime_enable(dev);

-	ret = pm_runtime_get_sync(dev);

-	if (ret < 0)

-		goto err1;

 	pm_runtime_forbid(dev);

@@ -1304,11 +1302,10 @@ err3:

 	dwc3_free_event_buffers(dwc);

 err2:

-	pm_runtime_allow(&pdev->dev);

-

-err1:

-	pm_runtime_put_sync(&pdev->dev);

-	pm_runtime_disable(&pdev->dev);

+	pm_runtime_allow(dev);

+	pm_runtime_disable(dev);

+	pm_runtime_set_suspended(dev);

+	pm_runtime_put_noidle(dev);

 err0:

 	/*