diff options
author | Ahmad Fatoum <ahmad@a3f.at> | 2019-11-15 08:32:39 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-15 14:40:52 +0100 |
commit | 2f443139ce8ecc48985d4ca07070796dafa472ac (patch) | |
tree | b77a21a3b541a13d19297095e5f8cbd994036352 /drivers | |
parent | b004955a303df0ae31911241e017ae486288dcde (diff) | |
download | barebox-2f443139ce8ecc48985d4ca07070796dafa472ac.tar.gz barebox-2f443139ce8ecc48985d4ca07070796dafa472ac.tar.xz |
net: designware: eqos: fix NULL pointer use in dev_printf
Inside mdio_register, a read of the PHY's id register is attempted.
If it fails, we print an error message with eqos_err, which uses the
ethernet device's unique name, but at this time there has been none set,
because eth_register was not yet called. Fix this by using the MDIO bus
device instead.
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/designware_eqos.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/designware_eqos.c b/drivers/net/designware_eqos.c index 84dcd04a3f..da67adf9a0 100644 --- a/drivers/net/designware_eqos.c +++ b/drivers/net/designware_eqos.c @@ -204,7 +204,7 @@ static int eqos_mdio_read(struct mii_bus *bus, int addr, int reg) ret = eqos_mdio_wait_idle(eqos); if (ret) { - eqos_err(eqos, "MDIO not idle at entry\n"); + dev_err(&bus->dev, "MDIO not idle at entry\n"); return ret; } @@ -222,7 +222,7 @@ static int eqos_mdio_read(struct mii_bus *bus, int addr, int reg) ret = eqos_mdio_wait_idle(eqos); if (ret) { - eqos_err(eqos, "MDIO read didn't complete\n"); + dev_err(&bus->dev, "MDIO read didn't complete\n"); return ret; } @@ -237,7 +237,7 @@ static int eqos_mdio_write(struct mii_bus *bus, int addr, int reg, u16 val) ret = eqos_mdio_wait_idle(eqos); if (ret) { - eqos_err(eqos, "MDIO not idle at entry\n"); + dev_err(&bus->dev, "MDIO not idle at entry\n"); return ret; } @@ -256,7 +256,7 @@ static int eqos_mdio_write(struct mii_bus *bus, int addr, int reg, u16 val) ret = eqos_mdio_wait_idle(eqos); if (ret) { - eqos_err(eqos, "MDIO read didn't complete\n"); + dev_err(&bus->dev, "MDIO read didn't complete\n"); return ret; } |