---

yaml --- r: 364125 b: refs/heads/master c: ddd4bd3 h: refs/heads/master i: 364123: 6202118 v: v3
git-mirror · Apr 11, 2013 · f7f97e3 · f7f97e3
1 parent d812ba6
commit f7f97e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a5c59687ad8fc6a84d97fd9cb3bbf15279793ac
+refs/heads/master: ddd4bd3e54d788d069ce022c4b93b069785e775a
diff --git a/trunk/drivers/staging/et131x/et131x.c b/trunk/drivers/staging/et131x/et131x.c
@@ -3953,6 +3953,7 @@ static void et131x_pci_remove(struct pci_dev *pdev)
 	unregister_netdev(netdev);
 	phy_disconnect(adapter->phydev);
 	mdiobus_unregister(adapter->mii_bus);
+	cancel_work_sync(&adapter->task);
 	kfree(adapter->mii_bus->irq);
 	mdiobus_free(adapter->mii_bus);