34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
diff -up ./drivers/net/e1000/base/e1000_phy.c.indent ./drivers/net/e1000/base/e1000_phy.c
|
|
--- ./drivers/net/e1000/base/e1000_phy.c.indent 2016-02-15 13:42:25.576470272 -0500
|
|
+++ ./drivers/net/e1000/base/e1000_phy.c 2016-02-15 13:48:18.070422353 -0500
|
|
@@ -4153,12 +4153,13 @@ s32 e1000_read_phy_reg_mphy(struct e1000
|
|
*data = E1000_READ_REG(hw, E1000_MPHY_DATA);
|
|
|
|
/* Disable access to mPHY if it was originally disabled */
|
|
- if (locked)
|
|
+ if (locked) {
|
|
ready = e1000_is_mphy_ready(hw);
|
|
if (!ready)
|
|
return -E1000_ERR_PHY;
|
|
E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
|
|
E1000_MPHY_DIS_ACCESS);
|
|
+ }
|
|
|
|
return E1000_SUCCESS;
|
|
}
|
|
@@ -4218,12 +4219,13 @@ s32 e1000_write_phy_reg_mphy(struct e100
|
|
E1000_WRITE_REG(hw, E1000_MPHY_DATA, data);
|
|
|
|
/* Disable access to mPHY if it was originally disabled */
|
|
- if (locked)
|
|
+ if (locked) {
|
|
ready = e1000_is_mphy_ready(hw);
|
|
if (!ready)
|
|
return -E1000_ERR_PHY;
|
|
E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
|
|
E1000_MPHY_DIS_ACCESS);
|
|
+ }
|
|
|
|
return E1000_SUCCESS;
|
|
}
|