From: Zev Weiss Date: Tue, 17 May 2022 22:16:39 +0000 (-0700) Subject: net: ftgmac100: use bus name in mdio error messages X-Git-Tag: v2022.10~56^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f44bf737841bb90a92b6c7eca9a8ee4075febe57;p=platform%2Fkernel%2Fu-boot.git 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 Fixes: 538e75d3fc54 ("net: ftgmac100: add MDIO bus and phylib support") Reviewed-by: Cédric Le Goater --- diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index 78779d7..74261d1 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;