---

yaml --- r: 352873 b: refs/heads/master c: 6e38bfa h: refs/heads/master i: 352871: e4edcb0 v: v3
git-mirror · Feb 5, 2013 · 1180d9d · 1180d9d
1 parent 17e09a0
commit 1180d9d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;