Skip to content

Commit 0c80cdb

Browse files
khfengJeff Kirsher
authored andcommitted
e1000e: Warn if disabling ULP failed
The hardware may stop working if driver failed to disable ULP mode. Take the return value of e1000_disable_ulp_lpt_lp() into account, and pass up the error if it fails. Signed-off-by: Kai-Heng Feng <[email protected]> Tested-by: Aaron Brown <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
1 parent 165ae7a commit 0c80cdb

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,11 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
300300
* so forcibly disable it.
301301
*/
302302
hw->dev_spec.ich8lan.ulp_state = e1000_ulp_state_unknown;
303-
e1000_disable_ulp_lpt_lp(hw, true);
303+
ret_val = e1000_disable_ulp_lpt_lp(hw, true);
304+
if (ret_val) {
305+
e_warn("Failed to disable ULP\n");
306+
goto out;
307+
}
304308

305309
ret_val = hw->phy.ops.acquire(hw);
306310
if (ret_val) {

0 commit comments

Comments
 (0)