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

Commit 026d7917 authored by Hans-Jürgen Koch's avatar Hans-Jürgen Koch Committed by Jeff Garzik
Browse files

Fix a lock problem in generic phy code 



Lock debugging finds a problem in phy.c and phy_device.c,
this patch fixes it. Tested on an AT91SAM9263-EK board,
kernel 2.6.23-rc4.

Signed-off-by: default avatarHans J. Koch <hjk@linutronix.de>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent d1b139c0

drivers/net/phy/phy.c

+2 −2
Original line number Diff line number Diff line
@@ -755,7 +755,7 @@ out_unlock: 
 */

void phy_start(struct phy_device *phydev)

{

	spin_lock(&phydev->lock);

	spin_lock_bh(&phydev->lock);



	switch (phydev->state) {

		case PHY_STARTING:
@@ -769,7 +769,7 @@ void phy_start(struct phy_device *phydev) 
		default:

			break;

	}

	spin_unlock(&phydev->lock);

	spin_unlock_bh(&phydev->lock);

}

EXPORT_SYMBOL(phy_stop);

EXPORT_SYMBOL(phy_start);

drivers/net/phy/phy_device.c

+2 −2
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ static int phy_probe(struct device *dev) 
	if (!(phydrv->flags & PHY_HAS_INTERRUPT))

		phydev->irq = PHY_POLL;



	spin_lock(&phydev->lock);

	spin_lock_bh(&phydev->lock);



	/* Start out supporting everything. Eventually,

	 * a controller will attach, and may modify one
@@ -658,7 +658,7 @@ static int phy_probe(struct device *dev) 
	if (phydev->drv->probe)

		err = phydev->drv->probe(phydev);



	spin_unlock(&phydev->lock);

	spin_unlock_bh(&phydev->lock);



	return err;