[PATCH] tpm: Fix tpm init with no ACPI entry

From: Derek Basehore
Date: Wed May 07 2014 - 20:31:54 EST


tpm_add_ppi fails without ACPI support now, but loading the tpm without an ACPI
entry is a valid use case. This changes the init of the tpm to not fail when
tpm_add_ppi fails.

Signed-off-by: Derek Basehore <dbasehore@xxxxxxxxxxxx>
---
drivers/char/tpm/tpm-interface.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 62e10fd..8bfa339 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -1094,8 +1094,7 @@ struct tpm_chip *tpm_register_hardware(struct device *dev,
if (tpm_sysfs_add_device(chip))
goto del_misc;

- if (tpm_add_ppi(&dev->kobj))
- goto del_misc;
+ tpm_add_ppi(&dev->kobj);

chip->bios_dir = tpm_bios_log_setup(chip->devname);

--
1.9.1.423.g4596e3a

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/