diff options
| author | sbruno <sbruno@FreeBSD.org> | 2016-08-18 07:32:02 +0000 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2016-08-18 07:32:02 +0000 |
| commit | f98eb5b43aa7f8732041e126eb1f006c6b6fee38 (patch) | |
| tree | 254c5848dc9d03abd8876532f49a0fd1355b7d7d /sys/dev/e1000/e1000_phy.c | |
| parent | ad413762f28e3be343987e707b9cf4f10f963693 (diff) | |
| download | FreeBSD-src-f98eb5b43aa7f8732041e126eb1f006c6b6fee38.zip FreeBSD-src-f98eb5b43aa7f8732041e126eb1f006c6b6fee38.tar.gz | |
MFC r304149
e1000: Add support for Kaby Lake IDs
Fixup some errors when transitioning to/from low power states.
Diffstat (limited to 'sys/dev/e1000/e1000_phy.c')
| -rw-r--r-- | sys/dev/e1000/e1000_phy.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/e1000/e1000_phy.c b/sys/dev/e1000/e1000_phy.c index b2bec3e..9684b43 100644 --- a/sys/dev/e1000/e1000_phy.c +++ b/sys/dev/e1000/e1000_phy.c @@ -4148,10 +4148,10 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data) /* Disable access to mPHY if it was originally disabled */ 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); + if (!ready) + return -E1000_ERR_PHY; + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, + E1000_MPHY_DIS_ACCESS); return E1000_SUCCESS; } @@ -4213,10 +4213,10 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data, /* Disable access to mPHY if it was originally disabled */ 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); + if (!ready) + return -E1000_ERR_PHY; + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, + E1000_MPHY_DIS_ACCESS); return E1000_SUCCESS; } |
