Page MenuHomeFreeBSD
Files F156851095

D5448.diff
No OneTemporary
Actions

D5448.diff
View Options

Index: head/sys/dev/e1000/e1000_phy.c
===================================================================
--- head/sys/dev/e1000/e1000_phy.c
+++ head/sys/dev/e1000/e1000_phy.c
@@ -4146,13 +4146,12 @@
*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);
-
+ }
+ E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, E1000_MPHY_DIS_ACCESS);
return E1000_SUCCESS;
}
@@ -4211,13 +4210,12 @@
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);
-
+ }
+ E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, E1000_MPHY_DIS_ACCESS);
return E1000_SUCCESS;
}

File Metadata

Mime Type
text/plain
Expires
Sun, May 17, 9:56 PM (49 m, 49 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33203287
Default Alt Text
D5448.diff (1013 B)

Event Timeline