summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorJason Gunthorpe <jgunthorpe@obsidianresearch.com>2016-11-22 09:58:56 -0700
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2016-11-28 01:31:33 +0200
commit9430066a15d6f55a3d008a6f99bb462480870207 (patch)
tree8273208d9d761d8fea7ce8af0bb6207546d30c58 /drivers/char
parentc4484f791c9434445db7fc1d6791af4388756479 (diff)
downloadlinux-stable-9430066a15d6f55a3d008a6f99bb462480870207.tar.gz
linux-stable-9430066a15d6f55a3d008a6f99bb462480870207.tar.bz2
linux-stable-9430066a15d6f55a3d008a6f99bb462480870207.zip
tpm: adjust return value of tpm_read_log
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/tpm/tpm_eventlog.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
index c73f88cdeadf..11bb1138a828 100644
--- a/drivers/char/tpm/tpm_eventlog.c
+++ b/drivers/char/tpm/tpm_eventlog.c
@@ -381,7 +381,8 @@ static int tpm_read_log(struct tpm_chip *chip)
* If an event log is found then the securityfs files are setup to
* export it to userspace, otherwise nothing is done.
*
- * Returns -ENODEV if the firmware has no event log.
+ * Returns -ENODEV if the firmware has no event log or securityfs is not
+ * supported.
*/
int tpm_bios_log_setup(struct tpm_chip *chip)
{
@@ -432,9 +433,10 @@ int tpm_bios_log_setup(struct tpm_chip *chip)
return 0;
err:
+ rc = PTR_ERR(chip->bios_dir[cnt]);
chip->bios_dir[cnt] = NULL;
tpm_bios_log_teardown(chip);
- return -EIO;
+ return rc;
}
void tpm_bios_log_teardown(struct tpm_chip *chip)