From: Aaron Sierra Date: Tue, 3 Nov 2015 18:37:18 +0000 (-0600) Subject: igb: Don't add PHY address to PCDL address X-Git-Tag: v4.1.12-105.0.20170622_2100~88 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6c3076e10c41fd9bec18e76ee2750b7174eaa3e8;p=users%2Fjedix%2Flinux-maple.git igb: Don't add PHY address to PCDL address There is no reason to add the PHY address into the PCDL register address. Signed-off-by: Aaron Sierra Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher (cherry picked from commit 06b0dd64923b5598a52de4c889a116c49493bf97) Orabug: 26325580 Signed-off-by: Kirtikar Kashyap Reviewed-by: Jack Vogel --- diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c index c906826b6c02..8015f3b8e579 100644 --- a/drivers/net/ethernet/intel/igb/e1000_phy.c +++ b/drivers/net/ethernet/intel/igb/e1000_phy.c @@ -1734,8 +1734,7 @@ s32 igb_get_cable_length_m88_gen2(struct e1000_hw *hw) goto out; /* Get cable length from PHY Cable Diagnostics Control Reg */ - ret_val = phy->ops.read_reg(hw, (I347AT4_PCDL + phy->addr), - &phy_data); + ret_val = phy->ops.read_reg(hw, I347AT4_PCDL, &phy_data); if (ret_val) goto out;