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 06:12:43 +0200 |
| commit | 026d7917e592f91063861e002adf1c806d7756ae (patch) | |
| tree | 02a5de4f89634c0e8a5b119df7fc4ee91f15da37 /drivers/net/phy/phy_device.c | |
| parent | sky2: restore multicast list on resume and other ops (diff) | |
| download | linux-026d7917e592f91063861e002adf1c806d7756ae.tar.xz linux-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/net/phy/phy_device.c')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index e275df8c55bc..49328e050505 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; |