From 4118afd6c95ad93ab1895c937d1ec7fb341139e6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 3 Feb 2007 01:13:50 -0800 Subject: [PATCH] --- yaml --- r: 46057 b: refs/heads/master c: 24d8f6aded45aca87dec6d9c037b75b189e3d731 h: refs/heads/master i: 46055: ec70903a88df1e5655523ffdffaacbeeee5c27e8 v: v3 --- [refs] | 2 +- trunk/drivers/net/smc911x.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f2b752d2a140..6823680d1308 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29a002776ba5ef170446910b1f93c480cdd43706 +refs/heads/master: 24d8f6aded45aca87dec6d9c037b75b189e3d731 diff --git a/trunk/drivers/net/smc911x.c b/trunk/drivers/net/smc911x.c index 880d9fdd7c67..43af61438449 100644 --- a/trunk/drivers/net/smc911x.c +++ b/trunk/drivers/net/smc911x.c @@ -968,11 +968,11 @@ static void smc911x_phy_configure(struct work_struct *work) * We should not be called if phy_type is zero. */ if (lp->phy_type == 0) - goto smc911x_phy_configure_exit; + goto smc911x_phy_configure_exit_nolock; if (smc911x_phy_reset(dev, phyaddr)) { printk("%s: PHY reset timed out\n", dev->name); - goto smc911x_phy_configure_exit; + goto smc911x_phy_configure_exit_nolock; } spin_lock_irqsave(&lp->lock, flags); @@ -1041,6 +1041,7 @@ static void smc911x_phy_configure(struct work_struct *work) smc911x_phy_configure_exit: spin_unlock_irqrestore(&lp->lock, flags); +smc911x_phy_configure_exit_nolock: lp->work_pending = 0; }