From aaeb12cdf9b421cc2f1b30aa1f70d55dbc58a2d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans-J=C3=BCrgen=20Koch?= Date: Fri, 31 Aug 2007 14:30:08 +0200 Subject: [PATCH] --- yaml --- r: 64967 b: refs/heads/master c: 026d7917e592f91063861e002adf1c806d7756ae h: refs/heads/master i: 64965: 35920e37efd3633d8633d9ca1f5ed78ed32a59e7 64963: b8bc1c511766aefb86f70f3a81156596f901575e 64959: f6de346165e91bc3c6c31c2425ef0e6e558787c9 v: v3 --- [refs] | 2 +- trunk/drivers/net/phy/phy.c | 4 ++-- trunk/drivers/net/phy/phy_device.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 96c98a299e24..c620d55f733e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1b139c039704c391ab47c6c9540c28f7fcaa489 +refs/heads/master: 026d7917e592f91063861e002adf1c806d7756ae diff --git a/trunk/drivers/net/phy/phy.c b/trunk/drivers/net/phy/phy.c index e323efd4ed18..0cc4369cacba 100644 --- a/trunk/drivers/net/phy/phy.c +++ b/trunk/drivers/net/phy/phy.c @@ -755,7 +755,7 @@ void phy_stop(struct phy_device *phydev) */ 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/trunk/drivers/net/phy/phy_device.c b/trunk/drivers/net/phy/phy_device.c index e275df8c55bc..49328e050505 100644 --- a/trunk/drivers/net/phy/phy_device.c +++ b/trunk/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;