1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index c17a305ecb28..dd21df55689d 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/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);
 }