From 140633896fad8f1e3793ba49bd8c6af92716c131 Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Thu, 6 Jan 2011 21:24:01 -0600
Subject: [PATCH] --- yaml --- r: 232267 b: refs/heads/master c:
 e5cce6c13c25d9ac56955a3ae2fd562719848172 h: refs/heads/master i:   232265:
 ff01f8e7f50faacfdc28463c04b47d90721361e3   232263:
 5ede9bf2dd4a03cc0682e76a1af4e5878da8f63b v: v3

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

diff --git a/[refs] b/[refs]
index 763c59806377..e12f496af7c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4ff4b829ef9e6353c0b133b7adb564a68054979
+refs/heads/master: e5cce6c13c25d9ac56955a3ae2fd562719848172
diff --git a/trunk/drivers/char/tpm/tpm_tis.c b/trunk/drivers/char/tpm/tpm_tis.c
index c17a305ecb28..dd21df55689d 100644
--- a/trunk/drivers/char/tpm/tpm_tis.c
+++ b/trunk/drivers/char/tpm/tpm_tis.c
@@ -493,9 +493,6 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
 		 "1.2 TPM (device-id 0x%X, rev-id %d)\n",
 		 vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));
 
-	if (is_itpm(to_pnp_dev(dev)))
-		itpm = 1;
-
 	if (itpm)
 		dev_info(dev, "Intel iTPM workaround enabled\n");
 
@@ -637,6 +634,9 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
 	else
 		interrupts = 0;
 
+	if (is_itpm(pnp_dev))
+		itpm = 1;
+
 	return tpm_tis_init(&pnp_dev->dev, start, len, irq);
 }