Commit df29df92 authored Dec 14, 2013 by Carolyn Wyborny Committed by David S. Miller Dec 14, 2013

igb: Fix for issue where values could be too high for udelay function.



This patch changes the igb_phy_has_link function to check the value of the
parameter before deciding to use udelay or mdelay in order to be sure that
the value is not too high for udelay function.

CC: stable kernel <stable@vger.kernel.org> # 3.9+
Signed-off-by: Sunil K Pandey <sunil.k.pandey@intel.com>
Signed-off-by: Kevin B Smith <kevin.b.smith@intel.com>
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3c325ced

drivers/net/ethernet/intel/igb/e1000_phy.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1728,6 +1728,9 @@ s32 igb_phy_has_link(struct e1000_hw *hw, u32 iterations,
	* ownership of the resources, wait and try again to		* ownership of the resources, wait and try again to
	* see if they have relinquished the resources yet.		* see if they have relinquished the resources yet.
	*/		*/
			if (usec_interval >= 1000)
			mdelay(usec_interval/1000);
			else
	udelay(usec_interval);		udelay(usec_interval);
	}		}
	ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);		ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);