openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

phy: rockchip-typec: Check for errors from tcphy_phy_init() 

The function tcphy_phy_init() could return an error but the callers
weren't checking the return value.  They should.  In at least one case
while testing I saw the message "wait pma ready timeout" which
indicates that tcphy_phy_init() really could return an error and we
should account for it.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
This commit is contained in:
Douglas Anderson 2017-09-29 16:58:46 -07:00 committed by Kishon Vijay Abraham I
parent 26e03d803c
commit 2fb850092f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/phy/rockchip/phy-rockchip-typec.c
View File

@ -708,8 +708,11 @@ static int rockchip_usb3_phy_power_on(struct phy *phy)
if (tcphy->mode == new_mode) if (tcphy->mode == new_mode)
goto unlock_ret; goto unlock_ret;
if (tcphy->mode == MODE_DISCONNECT) if (tcphy->mode == MODE_DISCONNECT) {
tcphy_phy_init(tcphy, new_mode); ret = tcphy_phy_init(tcphy, new_mode);
if (ret)
goto unlock_ret;
}
/* wait TCPHY for pipe ready */ /* wait TCPHY for pipe ready */
for (timeout = 0; timeout < 100; timeout++) { for (timeout = 0; timeout < 100; timeout++) {
@ -783,10 +786,12 @@ static int rockchip_dp_phy_power_on(struct phy *phy)
*/ */
if (new_mode == MODE_DFP_DP && tcphy->mode != MODE_DISCONNECT) { if (new_mode == MODE_DFP_DP && tcphy->mode != MODE_DISCONNECT) {
tcphy_phy_deinit(tcphy); tcphy_phy_deinit(tcphy);
tcphy_phy_init(tcphy, new_mode); ret = tcphy_phy_init(tcphy, new_mode);
} else if (tcphy->mode == MODE_DISCONNECT) { } else if (tcphy->mode == MODE_DISCONNECT) {
tcphy_phy_init(tcphy, new_mode); ret = tcphy_phy_init(tcphy, new_mode);
} }
if (ret)
goto unlock_ret;
ret = readx_poll_timeout(readl, tcphy->base + DP_MODE_CTL, ret = readx_poll_timeout(readl, tcphy->base + DP_MODE_CTL,
val, val & DP_MODE_A2, 1000, val, val & DP_MODE_A2, 1000,