diff options
| author | Tom Rini <trini@konsulko.com> | 2019-09-04 16:02:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-09-04 16:02:03 -0400 |
| commit | ece9834f7d223097cec92e3d3c70cd37b3768482 (patch) | |
| tree | d2935e582cb3494364bf2b7bc89a3d227d616e97 /drivers/net/pfe_eth/pfe_mdio.c | |
| parent | 448f11f7503995746a7b71e5e3b3a831c4651be9 (diff) | |
| parent | 5a5d1def59024dd3225e2a6142f8ee3ee10180a8 (diff) | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-net
- Assorted CVE fixes
- Other fixes
Diffstat (limited to 'drivers/net/pfe_eth/pfe_mdio.c')
| -rw-r--r-- | drivers/net/pfe_eth/pfe_mdio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c index 2dde9e7ac87..62309670fab 100644 --- a/drivers/net/pfe_eth/pfe_mdio.c +++ b/drivers/net/pfe_eth/pfe_mdio.c @@ -110,7 +110,6 @@ static int pfe_phy_write(struct mii_dev *bus, int phy_addr, int dev_addr, u32 phy; u32 reg_data; int timeout = MDIO_TIMEOUT; - int val; if (dev_addr == MDIO_DEVAD_NONE) { reg = ((reg_addr & EMAC_MII_DATA_RA_MASK) << @@ -150,7 +149,7 @@ static int pfe_phy_write(struct mii_dev *bus, int phy_addr, int dev_addr, debug("%s: phy: %02x reg:%02x val:%#x\n", __func__, phy_addr, reg_addr, data); - return val; + return 0; } static void pfe_configure_serdes(struct pfe_eth_dev *priv) |