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

Commit 2fb85009 authored by Douglas Anderson's avatar Douglas Anderson Committed by Kishon Vijay Abraham I
Browse files

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: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarGuenter Roeck <groeck@chromium.org>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent 26e03d80

drivers/phy/rockchip/phy-rockchip-typec.c

+9 −4
Original line number Diff line number Diff line
@@ -708,8 +708,11 @@ static int rockchip_usb3_phy_power_on(struct phy *phy) 
	if (tcphy->mode == new_mode)

		goto unlock_ret;



	if (tcphy->mode == MODE_DISCONNECT)

		tcphy_phy_init(tcphy, new_mode);

	if (tcphy->mode == MODE_DISCONNECT) {

		ret = tcphy_phy_init(tcphy, new_mode);

		if (ret)

			goto unlock_ret;

	}



	/* wait TCPHY for pipe ready */

	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) {

		tcphy_phy_deinit(tcphy);

		tcphy_phy_init(tcphy, new_mode);

		ret = tcphy_phy_init(tcphy, new_mode);

	} 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,

				 val, val & DP_MODE_A2, 1000,