From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751657AbdJCJlz (ORCPT ); Tue, 3 Oct 2017 05:41:55 -0400 Received: from lelnx194.ext.ti.com ([198.47.27.80]:33091 "EHLO lelnx194.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751327AbdJCJly (ORCPT ); Tue, 3 Oct 2017 05:41:54 -0400 Subject: Re: [PATCH] phy: rockchip-typec: Check for errors from tcphy_phy_init() To: Guenter Roeck , Douglas Anderson References: <20170929235846.1913-1-dianders@chromium.org> CC: Guenter Roeck , Chris , wulf , "open list:ARM/Rockchip SoC..." , linux-kernel , Heiko Stuebner , From: Kishon Vijay Abraham I Message-ID: <07d21b93-e58b-c5e3-8b9e-7150c023c452@ti.com> Date: Tue, 3 Oct 2017 15:11:04 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Saturday 30 September 2017 04:08 PM, Guenter Roeck wrote: > On Fri, Sep 29, 2017 at 4:58 PM, Douglas Anderson wrote: >> 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 > > Reviewed-by: Guenter Roeck merged, thanks! -Kishon > >> --- >> >> drivers/phy/rockchip/phy-rockchip-typec.c | 13 +++++++++---- >> 1 file changed, 9 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c >> index 4d2c57f21d76..38831eebc934 100644 >> --- a/drivers/phy/rockchip/phy-rockchip-typec.c >> +++ b/drivers/phy/rockchip/phy-rockchip-typec.c >> @@ -685,8 +685,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++) { >> @@ -760,10 +763,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, >> -- >> 2.14.2.822.g60be5d43e6-goog >>