[PATCH] ftgmac100: use bus name in mdio error messages

[Cédric Le Goater]

Hello Zev,

On 5/17/22 06:38, Zev Weiss wrote:
> 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 at bewilderbeest.net>
> Fixes: 538e75d3fc54 ("net: ftgmac100: add MDIO bus and phylib support")

You should send upstream.

Thanks,

C.

> ---
>   drivers/net/ftgmac100.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
> index 999941de14ac..aa1d63880c8c 100644
> --- a/drivers/net/ftgmac100.c
> +++ b/drivers/net/ftgmac100.c
> @@ -117,7 +117,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;
>   	}
>   
> @@ -149,7 +149,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;