diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-12 16:45:14 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-12 16:45:14 +0100 |
| commit | fe8998c5e3b173f3d5c450bbde6173e7fbe5158d (patch) | |
| tree | e098fe0774ba3f9e4b05a52dca078de7fb82fcca /drivers/net/sungem.c | |
| parent | 760141a53e5d72d4cc1d8c6e2a0232a24bedb36b (diff) | |
| download | op-kernel-dev-fe8998c5e3b173f3d5c450bbde6173e7fbe5158d.zip op-kernel-dev-fe8998c5e3b173f3d5c450bbde6173e7fbe5158d.tar.gz | |
sungem: update gp->reset_task flushing
gp->reset_task_pending is always set right before reset_task is
scheduled and as there is no synchronization between the setting and
scheduling, busy looping on reset_task_pending before flushing
reset_task doesn't really buy anything.
Directly flush gp->reset_task on suspend and cancel on detach.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Diffstat (limited to 'drivers/net/sungem.c')
| -rw-r--r-- | drivers/net/sungem.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 4ceb3cf..9e992ca 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -2380,10 +2380,8 @@ static int gem_suspend(struct pci_dev *pdev, pm_message_t state) */ mutex_unlock(&gp->pm_mutex); - /* Wait for a pending reset task to complete */ - while (gp->reset_task_pending) - yield(); - flush_scheduled_work(); + /* Wait for the pending reset task to complete */ + flush_work_sync(&gp->reset_task); /* Shut the PHY down eventually and setup WOL */ gem_stop_phy(gp, gp->asleep_wol); @@ -2928,10 +2926,8 @@ static void gem_remove_one(struct pci_dev *pdev) /* We shouldn't need any locking here */ gem_get_cell(gp); - /* Wait for a pending reset task to complete */ - while (gp->reset_task_pending) - yield(); - flush_scheduled_work(); + /* Cancel reset task */ + cancel_work_sync(&gp->reset_task); /* Shut the PHY down */ gem_stop_phy(gp, 0); |
