From 1180d9d2b97bcea595bf1156b0de46cc1ac4842e Mon Sep 17 00:00:00 2001
From: Kent Yoder <key@linux.vnet.ibm.com>
Date: Thu, 31 Jan 2013 09:39:31 -0600
Subject: [PATCH] --- yaml --- r: 352873 b: refs/heads/master c:
 6e38bfaad6c83bdd07eb659f9bfd50f8d71a5a46 h: refs/heads/master i:   352871:
 e4edcb061564878ea1967d32609f58600a868e13 v: v3

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

diff --git a/[refs] b/[refs]
index 032a7ee35d81..40af62dbdbe9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7333549bf4f345d338825dcd5b85400600e4cae7
+refs/heads/master: 6e38bfaad6c83bdd07eb659f9bfd50f8d71a5a46
diff --git a/trunk/drivers/char/tpm/tpm_tis.c b/trunk/drivers/char/tpm/tpm_tis.c
index 6c69ad72f82f..8a41b6be23a0 100644
--- a/trunk/drivers/char/tpm/tpm_tis.c
+++ b/trunk/drivers/char/tpm/tpm_tis.c
@@ -84,6 +84,9 @@ static int is_itpm(struct pnp_dev *dev)
 	struct acpi_device *acpi = pnp_acpi_device(dev);
 	struct acpi_hardware_id *id;
 
+	if (!acpi)
+		return 0;
+
 	list_for_each_entry(id, &acpi->pnp.ids, list) {
 		if (!strcmp("INTC0102", id->id))
 			return 1;