From 519cdf635a6382e70814c922dee5aca69ce5aa27 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Tue, 13 Feb 2007 12:16:45 -0800
Subject: [PATCH] --- yaml --- r: 48269 b: refs/heads/master c:
 436f137975507b0baab0859a253c3c9332c22f62 h: refs/heads/master i:   48267:
 70388d7e95870fd7bfa82bb46325d6862d9cb83b v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4c63f476131f..a1025cfb8fab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2e01bfef8399c8f39c9fdf4a5576039069e760c
+refs/heads/master: 436f137975507b0baab0859a253c3c9332c22f62
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index e136bae61970..0b5b8e7f55ac 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -12016,6 +12016,9 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state)
 	tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;
 	tg3_full_unlock(tp);
 
+	/* Save MSI address and data for resume.  */
+	pci_save_state(pdev);
+
 	err = tg3_set_power_state(tp, pci_choose_state(pdev, state));
 	if (err) {
 		tg3_full_lock(tp, 0);