shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Frank Wang
2019-06-25 08:38:20 +08:00
parent b3390d3b60
commit b2e17e3ba8
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/phy/rockchip/phy-rockchip-inno-usb2.c
View File

@@ -1643,13 +1643,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,
@@ -1661,13 +1662,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,
@@ -1676,14 +1678,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,
@@ -1694,7 +1697,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;
}
}
}
@@ -1708,7 +1711,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;
}
}
@@ -1719,7 +1722,7 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
EXTCON_USB_HOST, &rport->event_nb);
if (ret) {
dev_err(rphy->dev, "register USB HOST notifier failed\n");
return ret;
goto err;
}
}
@@ -1735,6 +1738,10 @@ out:
rport->suspended = true;
return 0;
err:
wake_lock_destroy(&rport->wakelock);
return ret;
}
static int rockchip_usb2phy_probe(struct platform_device *pdev)