Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d5844aa authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: dwc3: fix runtime pm imbalance on probe errors 



commit 9a8ad10c9f2e0925ff26308ec6756b93fc2f4977 upstream.

Make sure not to suspend the device when probe fails to avoid disabling
clocks and phys multiple times.

Fixes: 32808237 ("usb: dwc3: fix runtime PM in error path")
Cc: stable@vger.kernel.org      # 4.8
Cc: Roger Quadros <rogerq@ti.com>
Acked-by: default avatarThinh Nguyen <Thinh.Nguyen@synopsys.com>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20230404072524.19014-2-johan+linaro@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0804f371

drivers/usb/dwc3/core.c

+5 −9
Original line number Diff line number Diff line
@@ -1496,13 +1496,11 @@ static int dwc3_probe(struct platform_device *pdev) 


	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);
@@ -1562,12 +1560,10 @@ static int dwc3_probe(struct platform_device *pdev) 
	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);

disable_clks:

	clk_bulk_disable_unprepare(dwc->num_clks, dwc->clks);

assert_reset: