diff options
| author | Michael Chan <mchan@broadcom.com> | 2005-12-13 21:08:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-12-13 21:08:58 -0800 |
| commit | 6a9eba15f51c56da637e45ea1316eaa2a848986a (patch) | |
| tree | fb18f2580e6aaa2c14c042b51e80bc8eb6b9806b | |
| parent | 381291b7d3e17ac966498312dc571dcca1b93efc (diff) | |
| download | op-kernel-dev-6a9eba15f51c56da637e45ea1316eaa2a848986a.zip op-kernel-dev-6a9eba15f51c56da637e45ea1316eaa2a848986a.tar.gz | |
[TG3]: Fix suspend and resume
Fix tg3_suspend() and tg3_resume() by clearing and setting the
TG3_FLAG_INIT_COMPLETE flag when appropriate. tg3_set_power_state()
looks at TG3_FLAG_INIT_COMPLETE on the peer device to determine
when to appropriately switch to aux power.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/tg3.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index dabc39b..6b7ab4b 100644 --- a/drivers/net/tg3.c +++ b/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; |
