e1000e: Fix error path in link detection (c4c40e51) · Commits · 戴 / test

drivers/net/ethernet/intel/e1000e/phy.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1744,6 +1744,7 @@ s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
	s32 ret_val = 0;		s32 ret_val = 0;
	u16 i, phy_status;		u16 i, phy_status;

			*success = false;
	for (i = 0; i < iterations; i++) {		for (i = 0; i < iterations; i++) {
	/* Some PHYs require the MII_BMSR register to be read		/* Some PHYs require the MII_BMSR register to be read
	* twice due to the link bit being sticky. No harm doing		* twice due to the link bit being sticky. No harm doing
	@@ -1763,16 +1764,16 @@ s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
	ret_val = e1e_rphy(hw, MII_BMSR, &phy_status);		ret_val = e1e_rphy(hw, MII_BMSR, &phy_status);
	if (ret_val)		if (ret_val)
	break;		break;
	if (phy_status & BMSR_LSTATUS)		if (phy_status & BMSR_LSTATUS) {
			*success = true;
	break;		break;
			}
	if (usec_interval >= 1000)		if (usec_interval >= 1000)
	msleep(usec_interval / 1000);		msleep(usec_interval / 1000);
	else		else
	udelay(usec_interval);		udelay(usec_interval);
	}		}

	*success = (i < iterations);

	return ret_val;		return ret_val;
	}		}