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

Commit c4c40e51 authored by Benjamin Poirier's avatar Benjamin Poirier Committed by Jeff Kirsher
Browse files

e1000e: Fix error path in link detection 



In case of error from e1e_rphy(), the loop will exit early and "success"
will be set to true erroneously.

Signed-off-by: default avatarBenjamin Poirier <bpoirier@suse.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 812b5ca7

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

+4 −3
Original line number 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;

	u16 i, phy_status;



	*success = false;

	for (i = 0; i < iterations; i++) {

		/* Some PHYs require the MII_BMSR register to be read

		 * 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);

		if (ret_val)

			break;

		if (phy_status & BMSR_LSTATUS)

		if (phy_status & BMSR_LSTATUS) {

			*success = true;

			break;

		}

		if (usec_interval >= 1000)

			msleep(usec_interval / 1000);

		else

			udelay(usec_interval);

	}



	*success = (i < iterations);



	return ret_val;

}