X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fphy%2Fphy-omap-usb2.c;fp=drivers%2Fphy%2Fphy-omap-usb2.c;h=08f2da27083779fef174c5844680e57a64718c34;hb=2d4d9f35bab1cad7f83d10864291d1e50b12c3f9;hp=32c3e86b4935b125eb34ff56f9606649bed997b6;hpb=ebf3992061db1f7b3aa093f37fb308acc74fbc82;p=deliverable%2Flinux.git

diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c
index 32c3e86b4935..08f2da270837 100644
--- a/drivers/phy/phy-omap-usb2.c
+++ b/drivers/phy/phy-omap-usb2.c
@@ -254,14 +254,16 @@ static int omap_usb2_probe(struct platform_device *pdev)
 	otg->usb_phy		= &phy->phy;
 
 	platform_set_drvdata(pdev, phy);
+	pm_runtime_enable(phy->dev);
 
 	generic_phy = devm_phy_create(phy->dev, NULL, &ops, NULL);
-	if (IS_ERR(generic_phy))
+	if (IS_ERR(generic_phy)) {
+		pm_runtime_disable(phy->dev);
 		return PTR_ERR(generic_phy);
+	}
 
 	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)) {