Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fe32649 authored by David Daney's avatar David Daney Committed by David S. Miller
Browse files

netdev/phy: Use mdiobus_read() so that proper locks are taken. 



Accesses to the mdio busses must be done with the mdio_lock to ensure
proper operation.  Conveniently we have the helper function
mdiobus_read() to do that for us.  Lets use it in get_phy_id() instead
of accessing the bus without the lock held.

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8e00f5fb

drivers/net/phy/phy_device.c

+2 −2
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id) 


	/* Grab the bits from PHYIR1, and put them

	 * in the upper half */

	phy_reg = bus->read(bus, addr, MII_PHYSID1);

	phy_reg = mdiobus_read(bus, addr, MII_PHYSID1);



	if (phy_reg < 0)

		return -EIO;
@@ -221,7 +221,7 @@ int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id) 
	*phy_id = (phy_reg & 0xffff) << 16;



	/* Grab the bits from PHYIR2, and put them in the lower half */

	phy_reg = bus->read(bus, addr, MII_PHYSID2);

	phy_reg = mdiobus_read(bus, addr, MII_PHYSID2);



	if (phy_reg < 0)

		return -EIO;