---

yaml --- r: 225219 b: refs/heads/master c: cb8f404 h: refs/heads/master i: 225217: 25d0a94 225215: 59d2f1e v: v3
git-mirror · Dec 21, 2010 · 71d5adb · 71d5adb
1 parent f9c5e9b
commit 71d5adb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a13c13273a206e0c4b9a814277fb50529457abe7
+refs/heads/master: cb8f404893bab40431f7eeb2511454031b07e7df
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
@@ -8393,8 +8393,6 @@ bnx2_remove_one(struct pci_dev *pdev)
 	struct net_device *dev = pci_get_drvdata(pdev);
 	struct bnx2 *bp = netdev_priv(dev);
 
-	cancel_work_sync(&bp->reset_task);
-
 	unregister_netdev(dev);
 
 	if (bp->mips_firmware)