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

Commit eb82a3d8 authored by Roger Quadros's avatar Roger Quadros Committed by Greg Kroah-Hartman
Browse files

phy: omap-usb2: Balance pm_runtime_enable() on probe failure and remove 



If probe fails then we need to call pm_runtime_disable() to balance
out the previous pm_runtime_enable() call. Else it will cause
unbalanced pm_runtime_enable() call in the succeding probe call.

This anomaly was observed when the call to devm_phy_create() failed
with -EPROBE_DEFER.

Balance out the pm_runtime_enable() call in .remove() as well.

Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e73b49f1

drivers/phy/phy-omap-usb2.c

+5 −2
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ static int omap_usb2_probe(struct platform_device *pdev) 
	otg->phy		= &phy->phy;



	platform_set_drvdata(pdev, phy);

	pm_runtime_enable(phy->dev);



	generic_phy = devm_phy_create(phy->dev, &ops, NULL);

	if (IS_ERR(generic_phy))
@@ -270,10 +269,13 @@ static int omap_usb2_probe(struct platform_device *pdev) 


	phy_set_drvdata(generic_phy, phy);



	pm_runtime_enable(phy->dev);

	phy_provider = devm_of_phy_provider_register(phy->dev,

			of_phy_simple_xlate);

	if (IS_ERR(phy_provider))

	if (IS_ERR(phy_provider)) {

		pm_runtime_disable(phy->dev);

		return PTR_ERR(phy_provider);

	}



	phy->wkupclk = devm_clk_get(phy->dev, "wkupclk");

	if (IS_ERR(phy->wkupclk)) {
@@ -317,6 +319,7 @@ static int omap_usb2_remove(struct platform_device *pdev) 
	if (!IS_ERR(phy->optclk))

		clk_unprepare(phy->optclk);

	usb_remove_phy(&phy->phy);

	pm_runtime_disable(phy->dev);



	return 0;

}