[PATCH RESEND 1/3] staging: et131x: stop read when hit max delay in et131x_phy_mii_read

Zhao, Gang gamerh2o at gmail.com
Wed Feb 5 16:10:34 UTC 2014


stop read and return error when hit max delay time.

Signed-off-by: Zhao, Gang <gamerh2o at gmail.com>
Acked-by: Mark Einon <mark.einon at gmail.com>
---

Acked at post: http://article.gmane.org/gmane.linux.kernel/1599347

 drivers/staging/et131x/et131x.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index e516bb6..cf97049 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -1388,6 +1388,7 @@ static int et131x_phy_mii_read(struct et131x_adapter *adapter, u8 addr,
 			    mii_indicator);
 
 		status = -EIO;
+		goto out;
 	}
 
 	/* If we hit here we were able to read the register and we need to
@@ -1395,6 +1396,7 @@ static int et131x_phy_mii_read(struct et131x_adapter *adapter, u8 addr,
 	 */
 	*value = readl(&mac->mii_mgmt_stat) & ET_MAC_MIIMGMT_STAT_PHYCRTL_MASK;
 
+out:
 	/* Stop the read operation */
 	writel(0, &mac->mii_mgmt_cmd);
 
-- 
1.8.5.3



More information about the devel mailing list