From b535b03cbf8d55b480466b0173c6ef89b3cb31d5 Mon Sep 17 00:00:00 2001
From: David Smith <dds@google.com>
Date: Mon, 14 Jan 2008 00:55:12 -0800
Subject: [PATCH] --- yaml --- r: 75445 b: refs/heads/master c:
 2490c681ea3d7f5ac3fb876f14567bf1a9e0aa87 h: refs/heads/master i:   75443:
 ae1996a02f7c6f39880c888a04357a5635105de8 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/char/tpm/tpm.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3478e56afe04..2b88f1eb80d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40d6a146629b98d8e322b6f9332b182c7cbff3df
+refs/heads/master: 2490c681ea3d7f5ac3fb876f14567bf1a9e0aa87
diff --git a/trunk/drivers/char/tpm/tpm.c b/trunk/drivers/char/tpm/tpm.c
index 39564b76d4a3..c88424a0c89b 100644
--- a/trunk/drivers/char/tpm/tpm.c
+++ b/trunk/drivers/char/tpm/tpm.c
@@ -1046,12 +1046,6 @@ void tpm_remove_hardware(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(tpm_remove_hardware);
 
-static u8 savestate[] = {
-	0, 193,			/* TPM_TAG_RQU_COMMAND */
-	0, 0, 0, 10,		/* blob length (in bytes) */
-	0, 0, 0, 152		/* TPM_ORD_SaveState */
-};
-
 /*
  * We are about to suspend. Save the TPM state
  * so that it can be restored.
@@ -1059,6 +1053,12 @@ static u8 savestate[] = {
 int tpm_pm_suspend(struct device *dev, pm_message_t pm_state)
 {
 	struct tpm_chip *chip = dev_get_drvdata(dev);
+	u8 savestate[] = {
+		0, 193,		/* TPM_TAG_RQU_COMMAND */
+		0, 0, 0, 10,	/* blob length (in bytes) */
+		0, 0, 0, 152	/* TPM_ORD_SaveState */
+	};
+
 	if (chip == NULL)
 		return -ENODEV;