phy: phy-rockchip-inno-usb2: add exception handling for wakelock

The "OTG wakelock" should be destroyed if otg port was initialized
failed, in case of its memory allocate for other module and the
"wakeup_sources" list would be broken.

Change-Id: Ic478e7297e36def8e105a0736beb86c99ca6261d
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>

1 files changed, 16 insertions, 9 deletions

diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index 34f28a3dee17..747a39c0c3a9 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -1652,13 +1652,14 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
 		if (ret) {
 			dev_err(rphy->dev,
 				"failed to request otg-mux irq handle\n");
-			return ret;
+			goto err;
 		}
 	} else {
 		rport->bvalid_irq = of_irq_get_byname(child_np, "otg-bvalid");
 		if (rport->bvalid_irq <= 0) {
 			dev_err(rphy->dev, "no vbus valid irq provided\n");
-			return -EINVAL;
+			ret = -EINVAL;
+			goto err;
 		}
 
 		ret = devm_request_threaded_irq(rphy->dev, rport->bvalid_irq,
@@ -1670,13 +1671,14 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
 		if (ret) {
 			dev_err(rphy->dev,
 				"failed to request otg-bvalid irq handle\n");
-			return ret;
+			goto err;
 		}
 
 		rport->ls_irq = of_irq_get_byname(child_np, "linestate");
 		if (rport->ls_irq <= 0) {
 			dev_err(rphy->dev, "no linestate irq provided\n");
-			return -EINVAL;
+			ret = -EINVAL;
+			goto err;
 		}
 
 		ret = devm_request_threaded_irq(rphy->dev, rport->ls_irq, NULL,
@@ -1685,14 +1687,15 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
 						"rockchip_usb2phy", rport);
 		if (ret) {
 			dev_err(rphy->dev, "failed to request linestate irq handle\n");
-			return ret;
+			goto err;
 		}
 
 		if (rphy->edev_self) {
 			rport->id_irq = of_irq_get_byname(child_np, "otg-id");
 			if (rport->id_irq <= 0) {
 				dev_err(rphy->dev, "no otg id irq provided\n");
-				return -EINVAL;
+				ret = -EINVAL;
+				goto err;
 			}
 
 			ret = devm_request_threaded_irq(rphy->dev,
@@ -1703,7 +1706,7 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
 							rport);
 			if (ret) {
 				dev_err(rphy->dev, "failed to request otg-id irq handle\n");
-				return ret;
+				goto err;
 			}
 		}
 	}
@@ -1717,7 +1720,7 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
 			/* Enable VBUS supply */
 			ret = rockchip_set_vbus_power(rport, true);
 			if (ret)
-				return ret;
+				goto err;
 		}
 	}
 
@@ -1728,7 +1731,7 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
 					       &rport->event_nb);
 		if (ret < 0) {
 			dev_err(rphy->dev, "register USB HOST notifier failed\n");
-			return ret;
+			goto err;
 		}
 	}
 
@@ -1744,6 +1747,10 @@ out:
 	rport->suspended = true;
 
 	return 0;
+
+err:
+	wake_lock_destroy(&rport->wakelock);
+	return ret;
 }
 
 static int rockchip_usb2phy_probe(struct platform_device *pdev)