diff options
| author | Hans-Jürgen Koch <hjk@linutronix.de> | 2007-08-31 14:30:08 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-09-13 00:12:43 -0400 |
| commit | 026d7917e592f91063861e002adf1c806d7756ae (patch) | |
| tree | 02a5de4f89634c0e8a5b119df7fc4ee91f15da37 /drivers | |
| parent | d1b139c039704c391ab47c6c9540c28f7fcaa489 (diff) | |
| download | linux-3.10-026d7917e592f91063861e002adf1c806d7756ae.tar.gz linux-3.10-026d7917e592f91063861e002adf1c806d7756ae.tar.bz2 linux-3.10-026d7917e592f91063861e002adf1c806d7756ae.zip | |
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: Hans J. Koch <hjk@linutronix.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/phy.c | 4 | ||||
| -rw-r--r-- | drivers/net/phy/phy_device.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index e323efd4ed1..0cc4369cacb 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -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); diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index e275df8c55b..49328e05050 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -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; |