diff options
| author | Antoine Tenart <antoine.tenart@bootlin.com> | 2020-06-25 17:42:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-25 16:22:11 -0700 |
| commit | b4368d2b5b96f01c9b0780096dc2306d78c3e72f (patch) | |
| tree | 9e6e7ec17a6507194026e7937af58b379735a1bc | |
| parent | d4a76dc74dff76c4d7f193806f336899fb8e5016 (diff) | |
| download | linux-stable-b4368d2b5b96f01c9b0780096dc2306d78c3e72f.tar.gz linux-stable-b4368d2b5b96f01c9b0780096dc2306d78c3e72f.tar.bz2 linux-stable-b4368d2b5b96f01c9b0780096dc2306d78c3e72f.zip | |
net: phy: mscc: improve vsc8514/8584_config_init consistency
All PHY read and write return values are checked for errors in
vsc8514_config_init and vsc8584_config_init, except for one. Fix this.
Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/mscc/mscc_main.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c index 04e1ef791cec..a4fbf3a4fa97 100644 --- a/drivers/net/phy/mscc/mscc_main.c +++ b/drivers/net/phy/mscc/mscc_main.c @@ -1375,8 +1375,10 @@ static int vsc8584_config_init(struct phy_device *phydev) goto err; } - phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, - MSCC_PHY_PAGE_EXTENDED_GPIO); + ret = phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, + MSCC_PHY_PAGE_EXTENDED_GPIO); + if (ret) + goto err; val = phy_base_read(phydev, MSCC_PHY_MAC_CFG_FASTLINK); val &= ~MAC_CFG_MASK; @@ -1774,8 +1776,10 @@ static int vsc8514_config_init(struct phy_device *phydev) if (phy_package_init_once(phydev)) vsc8514_config_pre_init(phydev); - phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, - MSCC_PHY_PAGE_EXTENDED_GPIO); + ret = phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, + MSCC_PHY_PAGE_EXTENDED_GPIO); + if (ret) + goto err; val = phy_base_read(phydev, MSCC_PHY_MAC_CFG_FASTLINK); |