From: Derek Basehore <dbasehore@chromium.org>
To: Peter Huewe <peterhuewe@gmx.de>
Cc: Ashley Lai <ashley@ashleylai.com>,
Marcel Selhorst <tpmdd@selhorst.net>,
tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org,
Derek Basehore <dbasehore@chromium.org>
Subject: [PATCH] tpm: Fix tpm init with no ACPI entry
Date: Wed, 7 May 2014 17:31:40 -0700 [thread overview]
Message-ID: <1399509100-27169-1-git-send-email-dbasehore@chromium.org> (raw)
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@chromium.org>
---
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
next reply other threads:[~2014-05-08 0:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-08 0:31 Derek Basehore [this message]
2014-05-08 6:09 ` Peter Huewe
2014-05-08 6:20 ` dbasehore .
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1399509100-27169-1-git-send-email-dbasehore@chromium.org \
--to=dbasehore@chromium.org \
--cc=ashley@ashleylai.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=tpmdd-devel@lists.sourceforge.net \
--cc=tpmdd@selhorst.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®