aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Yoder <key@linux.vnet.ibm.com>2013-01-31 10:39:31 -0500
committerKent Yoder <key@linux.vnet.ibm.com>2013-02-05 10:38:26 -0500
commit6e38bfaad6c83bdd07eb659f9bfd50f8d71a5a46 (patch)
tree7cdfb2a18dee73e3fcc503fbba6e8fd012ee8e8f
parent7333549bf4f345d338825dcd5b85400600e4cae7 (diff)
tpm_tis: check pnp_acpi_device return code
Reported-by: Peter Hüwe <peterhuewe@gmx.de> Reviewed-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>
-rw-r--r--drivers/char/tpm/tpm_tis.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 6c69ad72f82f..8a41b6be23a0 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -84,6 +84,9 @@ static int is_itpm(struct pnp_dev *dev)
84 struct acpi_device *acpi = pnp_acpi_device(dev); 84 struct acpi_device *acpi = pnp_acpi_device(dev);
85 struct acpi_hardware_id *id; 85 struct acpi_hardware_id *id;
86 86
87 if (!acpi)
88 return 0;
89
87 list_for_each_entry(id, &acpi->pnp.ids, list) { 90 list_for_each_entry(id, &acpi->pnp.ids, list) {
88 if (!strcmp("INTC0102", id->id)) 91 if (!strcmp("INTC0102", id->id))
89 return 1; 92 return 1;