aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/vxge/vxge-main.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-14 23:03:29 -0500
committerDavid S. Miller <davem@davemloft.net>2010-12-20 00:54:32 -0500
commitba27d85c96c57111ae8acfa959643e5ce8e4bcbe (patch)
tree3bf910630c93ed9d6fed31f972b1a1953df1137b /drivers/net/vxge/vxge-main.c
parent71d9dec24dce548bf699815c976cf063ad9257e2 (diff)
vxge: add missing flush of reset_task
Commit 6e07ebd84 (drivers/net: remove unnecessary flush_scheduled_work() calls) incorrectly removed the flush call without replacing it with the appropriate work specific operation. Fix it by flushing vdev->reset_task explicitly. Pointed out by Jon Mason. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Jon Mason <jon.mason@exar.com> Acked-by: Jon Mason <jon.mason@exar.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxge/vxge-main.c')
-rw-r--r--drivers/net/vxge/vxge-main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 537ad874f11c..1ac9b568f1b0 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -3439,6 +3439,8 @@ static void vxge_device_unregister(struct __vxge_hw_device *hldev)
3439 3439
3440 strncpy(buf, dev->name, IFNAMSIZ); 3440 strncpy(buf, dev->name, IFNAMSIZ);
3441 3441
3442 flush_work_sync(&vdev->reset_task);
3443
3442 /* in 2.6 will call stop() if device is up */ 3444 /* in 2.6 will call stop() if device is up */
3443 unregister_netdev(dev); 3445 unregister_netdev(dev);
3444 3446