]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
tpm: don't print error message in tpm_transmit_cmd when tpm still testing
authorJerry Snitselaar <jsnitsel@redhat.com>
Tue, 29 Jan 2019 18:59:11 +0000 (11:59 -0700)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Wed, 13 Feb 2019 07:47:01 +0000 (09:47 +0200)
Currently tpm_transmit_cmd will print an error message if the tpm
returns something other than TPM2_RC_SUCCESS. This means that if the
tpm returns that it is testing an error message will be printed, and
this can cause confusion for the end user. So avoid printing the error
message if TPM2_RC_TESTING is the return code.

Cc: Peter Huewe <peterhuewe@gmx.de>
Cc: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
drivers/char/tpm/tpm-interface.c

index 88d2e01a651d84bd6fbdf87be82efeb92c323cd7..624075e767b86c7719a653ef53bd7eed3ffca6d4 100644 (file)
@@ -406,7 +406,7 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
 
        err = be32_to_cpu(header->return_code);
        if (err != 0 && err != TPM_ERR_DISABLED && err != TPM_ERR_DEACTIVATED
-           && desc)
+           && err != TPM2_RC_TESTING && desc)
                dev_err(&chip->dev, "A TPM error (%d) occurred %s\n", err,
                        desc);
        if (err)