---

yaml --- r: 200875 b: refs/heads/master c: 7ae80ab h: refs/heads/master i: 200873: f260744 200871: 8dd1217 v: v3
git-mirror · Jul 3, 2010 · f98684b · f98684b
1 parent 66fafcd
commit f98684b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72046d84f0d6e3047f4d5a5173260141983b2b61
+refs/heads/master: 7ae80abdba0644e12ac17da567a2db1efc1bf8a8
diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c
@@ -4712,6 +4712,8 @@ static void ql_eeh_close(struct net_device *ndev)
 		netif_stop_queue(ndev);
 	}
 
+	/* Disabling the timer */
+	del_timer_sync(&qdev->timer);
 	if (test_bit(QL_ADAPTER_UP, &qdev->flags))
 		cancel_delayed_work_sync(&qdev->asic_reset_work);
 	cancel_delayed_work_sync(&qdev->mpi_reset_work);