1 files changed, 5 insertions, 19 deletions

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 4e280020518..e2ee91a6ae7 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -136,7 +136,6 @@ struct smc911x_local {
 
         /* work queue */
         struct work_struct phy_configure;
-        int work_pending;
 
         int tx_throttle;
         spinlock_t lock;
@@ -960,11 +959,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_nolock;
+                return;
 
         if (smc911x_phy_reset(dev, phyaddr)) {
                 printk("%s: PHY reset timed out\n", dev->name);
-                goto smc911x_phy_configure_exit_nolock;
+                return;
         }
         spin_lock_irqsave(&lp->lock, flags);
 
@@ -1033,8 +1032,6 @@ 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;
 }
 
 /*
@@ -1356,11 +1353,8 @@ static void smc911x_timeout(struct net_device *dev)
          * smc911x_phy_configure() calls msleep() which calls schedule_timeout()
          * which calls schedule().       Hence we use a work queue.
          */
-        if (lp->phy_type != 0) {
-                if (schedule_work(&lp->phy_configure)) {
-                        lp->work_pending = 1;
-                }
-        }
+        if (lp->phy_type != 0)
+                schedule_work(&lp->phy_configure);
 
         /* We can accept TX packets again */
         dev->trans_start = jiffies;
@@ -1531,16 +1525,8 @@ static int smc911x_close(struct net_device *dev)
         if (lp->phy_type != 0) {
                 /* We need to ensure that no calls to
                  * smc911x_phy_configure are pending.
-
-                 * flush_scheduled_work() cannot be called because we
-                 * are running with the netlink semaphore held (from
-                 * devinet_ioctl()) and the pending work queue
-                 * contains linkwatch_event() (scheduled by
-                 * netif_carrier_off() above). linkwatch_event() also
-                 * wants the netlink semaphore.
                  */
-                while (lp->work_pending)
-                        schedule();
+                cancel_work_sync(&lp->phy_configure);
                 smc911x_phy_powerdown(dev, lp->mii.phy_id);
         }