From f7f97e30121182d00d65b65d0448cc43ece6b3bc Mon Sep 17 00:00:00 2001
From: Devendra Naga <devendra.aaru@gmail.com>
Date: Wed, 10 Apr 2013 12:34:00 +0530
Subject: [PATCH] --- yaml --- r: 364125 b: refs/heads/master c:
 ddd4bd3e54d788d069ce022c4b93b069785e775a h: refs/heads/master i:   364123:
 62021189d9651bfc28e4cade57578a71ee2b4608 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/et131x/et131x.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 88eedf8bf5f1..380935adb5a3 100644
--- 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
index c7e9e1d6bf70..f73e58f5ef8d 100644
--- 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);