diff options
| author | Zev Weiss <zev@bewilderbeest.net> | 2022-05-17 15:16:39 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-08-08 10:50:20 -0400 |
| commit | f44bf737841bb90a92b6c7eca9a8ee4075febe57 (patch) | |
| tree | 2ed698d70b8f429af7641ad6468a62482c1d9999 /drivers | |
| parent | 52503d813578e1d74b8dbac134f06c52929c7df8 (diff) | |
| download | u-boot-f44bf737841bb90a92b6c7eca9a8ee4075febe57.tar.gz | |
net: ftgmac100: use bus name in mdio error messages
Previously we'd been using a device name retrieved via
ftgmac100_data->phydev, but the mdio read/write functions may be
called before that member is initialized in ftgmac100_phy_init(),
leading to a NULL pointer dereference while printing the error message
issued if the mdio access fails. We can instead use bus->name, which
is already available at that point.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Fixes: 538e75d3fc54 ("net: ftgmac100: add MDIO bus and phylib support")
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ftgmac100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index 78779d7d60..74261d14e5 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -119,7 +119,7 @@ static int ftgmac100_mdio_read(struct mii_dev *bus, int phy_addr, int dev_addr, FTGMAC100_MDIO_TIMEOUT_USEC); if (ret) { pr_err("%s: mdio read failed (phy:%d reg:%x)\n", - priv->phydev->dev->name, phy_addr, reg_addr); + bus->name, phy_addr, reg_addr); return ret; } @@ -151,7 +151,7 @@ static int ftgmac100_mdio_write(struct mii_dev *bus, int phy_addr, int dev_addr, FTGMAC100_MDIO_TIMEOUT_USEC); if (ret) { pr_err("%s: mdio write failed (phy:%d reg:%x)\n", - priv->phydev->dev->name, phy_addr, reg_addr); + bus->name, phy_addr, reg_addr); } return ret; |