net/ixgbe/base: clear page register in error path
authorXiao Wang <xiao.w.wang@intel.com>
Sun, 25 Sep 2016 08:59:49 +0000 (16:59 +0800)
committerBruce Richardson <bruce.richardson@intel.com>
Fri, 30 Sep 2016 10:27:18 +0000 (12:27 +0200)
The error exit should at least try to set the page register to 0
since other code will assume that state.

Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
drivers/net/ixgbe/base/ixgbe_x550.c

index bf3da10..2cd5730 100644 (file)
@@ -2349,6 +2349,7 @@ STATIC s32 ixgbe_reset_phy_m88(struct ixgbe_hw *hw)
        return ixgbe_setup_m88(hw);
 
 out:
+       hw->phy.ops.write_reg_mdi(hw, IXGBE_M88E1500_PAGE_ADDR, 0, 0);
        hw->mac.ops.release_swfw_sync(hw, mask);
        return rc;
 }