KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: ag71xx_phy: Fix compilation for debug messages

Browse source 
NB: Error only appears with ag71xx debug messages and dynamic printk
enabled.  This is probably why no one has caught it before.

Previously phy probe debug messages used old (now wrong) functions
to get the phy name for printing.  There was also the chance of
a NULL pointer in the event no phy_device was found.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
This commit is contained in:
Daniel F. Dickinson 2018-07-25 19:14:26 -04:00 committed by John Crispin
parent 0a492ee39e
commit 2655fbe8ef
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_phy.c
View file

@ -119,7 +119,8 @@ static int ag71xx_phy_connect_multi(struct ag71xx *ag)
DBG("%s: PHY found at %s, uid=%08x\n", DBG("%s: PHY found at %s, uid=%08x\n",
dev_name(dev), dev_name(dev),
dev_name(&ag->mii_bus->phy_map[phy_addr]->dev), dev_name(&ag->mii_bus->phy_map[phy_addr]->dev),
ag->mii_bus->phy_map[phy_addr]->phy_id); &ag->mii_bus->phy_map[phy_addr]->phy_id),
&ag->mii_bus->phy_map[phy_addr]->phy_id : 0);
if (phydev == NULL) if (phydev == NULL)
phydev = ag->mii_bus->phy_map[phy_addr]; phydev = ag->mii_bus->phy_map[phy_addr];
@ -130,7 +131,8 @@ static int ag71xx_phy_connect_multi(struct ag71xx *ag)
DBG("%s: PHY found at %s, uid=%08x\n", DBG("%s: PHY found at %s, uid=%08x\n",
dev_name(dev), dev_name(dev),
dev_name(&ag->mii_bus->mdio_map[phy_addr]->dev), dev_name(&ag->mii_bus->mdio_map[phy_addr]->dev),
ag->mii_bus->mdio_map[phy_addr]->phy_id); mdiobus_get_phy(ag->mii_bus, phy_addr) ?
mdiobus_get_phy(ag->mii_bus, phy_addr)->phy_id : 0);
if (phydev == NULL) if (phydev == NULL)
phydev = mdiobus_get_phy(ag->mii_bus, phy_addr); phydev = mdiobus_get_phy(ag->mii_bus, phy_addr);