From f98684b18c1976994c7597116b1d3f2faac58f3f Mon Sep 17 00:00:00 2001 From: Breno Leitao Date: Thu, 1 Jul 2010 03:00:18 +0000 Subject: [PATCH] --- yaml --- r: 200875 b: refs/heads/master c: 7ae80abdba0644e12ac17da567a2db1efc1bf8a8 h: refs/heads/master i: 200873: f2607442d8e8395da83a8aa8a247c305e61148db 200871: 8dd12179bf7e5238d6e5be9970ef6663a18d1530 v: v3 --- [refs] | 2 +- trunk/drivers/net/qlge/qlge_main.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 121634a95d88..992e3e128bff 100644 --- 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 index 509dadcd1c5a..d10bcefc0e45 100644 --- 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);