[PATCH 3/3] net: designware: eqos: fix NULL pointer use in dev_printf

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxx>
---
 drivers/net/designware_eqos.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/designware_eqos.c b/drivers/net/designware_eqos.c
index 84dcd04a3fc9..da67adf9a0f0 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;
 	}
 
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox



[Index of Archives]     [Linux Embedded]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux