From 504cde3016b7c5a242bcc3b0fc6f7e9564357e2c Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Tue, 13 Dec 2005 21:08:58 -0800 Subject: [PATCH] --- yaml --- r: 15121 b: refs/heads/master c: 6a9eba15f51c56da637e45ea1316eaa2a848986a h: refs/heads/master i: 15119: ba363735c4ed9df675872b8b157439ff0707803a v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6582dfc1a0f6..94b0d51f3b99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 381291b7d3e17ac966498312dc571dcca1b93efc +refs/heads/master: 6a9eba15f51c56da637e45ea1316eaa2a848986a diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index dabc39befd3c..6b7ab4b72752 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -10826,12 +10826,14 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state) tg3_full_lock(tp, 0); tg3_halt(tp, RESET_KIND_SHUTDOWN, 1); + tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE; tg3_full_unlock(tp); err = tg3_set_power_state(tp, pci_choose_state(pdev, state)); if (err) { tg3_full_lock(tp, 0); + tp->tg3_flags |= TG3_FLAG_INIT_COMPLETE; tg3_init_hw(tp); tp->timer.expires = jiffies + tp->timer_offset; @@ -10865,6 +10867,7 @@ static int tg3_resume(struct pci_dev *pdev) tg3_full_lock(tp, 0); + tp->tg3_flags |= TG3_FLAG_INIT_COMPLETE; tg3_init_hw(tp); tp->timer.expires = jiffies + tp->timer_offset;