Commit 7857a1b1 authored by Vitaly Chikunov's avatar Vitaly Chikunov Committed by Jan Kiszka

rt_e1000e: Fix __bad_udelay linking error

This is similar to upstream commit 9e6c3b63399dd ("e1000e: fix compiler
warnings" by David Ertman). Fix compile error:

  ERROR: "__bad_udelay" [drivers/xenomai/net/drivers/e1000e/rt_e1000e.ko] undefined!
Signed-off-by: default avatarVitaly Chikunov <vt@altlinux.org>
Signed-off-by: Jan Kiszka's avatarJan Kiszka <jan.kiszka@siemens.com>
parent 932fc81c
......@@ -1787,13 +1787,17 @@ s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
* it across the board.
*/
ret_val = e1e_rphy(hw, PHY_STATUS, &phy_status);
if (ret_val)
if (ret_val) {
/*
* If the first read fails, another entity may have
* ownership of the resources, wait and try again to
* see if they have relinquished the resources yet.
*/
udelay(usec_interval);
if (usec_interval >= 1000)
mdelay(usec_interval/1000);
else
udelay(usec_interval);
}
ret_val = e1e_rphy(hw, PHY_STATUS, &phy_status);
if (ret_val)
break;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment