diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-05-24 13:47:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-24 13:47:27 -0700 |
| commit | 13209a8f7304a34158f4366e8ea07a1965c05ac7 (patch) | |
| tree | f25ba4846fe02a32d4a14ef1a6be3227363da919 /drivers/net/phy/mscc/mscc_main.c | |
| parent | ethtool: propagate get_coalesce return value (diff) | |
| parent | Merge tag 'efi-urgent-2020-05-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| download | wireguard-linux-13209a8f7304a34158f4366e8ea07a1965c05ac7.tar.xz wireguard-linux-13209a8f7304a34158f4366e8ea07a1965c05ac7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The MSCC bug fix in 'net' had to be slightly adjusted because the
register accesses are done slightly differently in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/mscc/mscc_main.c')
| -rw-r--r-- | drivers/net/phy/mscc/mscc_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c index 6508d6536134..550acf547ced 100644 --- a/drivers/net/phy/mscc/mscc_main.c +++ b/drivers/net/phy/mscc/mscc_main.c @@ -1303,6 +1303,8 @@ static void vsc8584_get_base_addr(struct phy_device *phydev) vsc8531->base_addr = phydev->mdio.addr + addr; else vsc8531->base_addr = phydev->mdio.addr - addr; + + vsc8531->addr = addr; } static int vsc8584_config_init(struct phy_device *phydev) |