lkml.org 
[lkml]   [2018]   [Nov]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 05/16] tpm: print tpm2_commit_space() error inside tpm2_commit_space()
    Date
    The error logging for tpm2_commit_space() is in a wrong place. This
    commit moves it inside that function.

    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    ---
    drivers/char/tpm/tpm2-space.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/drivers/char/tpm/tpm2-space.c b/drivers/char/tpm/tpm2-space.c
    index d53c882268ff..3d5f9577e5de 100644
    --- a/drivers/char/tpm/tpm2-space.c
    +++ b/drivers/char/tpm/tpm2-space.c
    @@ -501,19 +501,19 @@ int tpm2_commit_space(struct tpm_chip *chip, struct tpm_space *space,
    rc = tpm2_map_response_header(chip, cc, buf, *bufsiz);
    if (rc) {
    tpm2_flush_space(chip);
    - return rc;
    + goto out;
    }

    rc = tpm2_map_response_body(chip, cc, buf, *bufsiz);
    if (rc) {
    tpm2_flush_space(chip);
    - return rc;
    + goto out;
    }

    rc = tpm2_save_space(chip);
    if (rc) {
    tpm2_flush_space(chip);
    - return rc;
    + goto out;
    }

    *bufsiz = be32_to_cpu(header->length);
    @@ -526,4 +526,7 @@ int tpm2_commit_space(struct tpm_chip *chip, struct tpm_space *space,
    memcpy(space->session_buf, chip->work_space.session_buf, PAGE_SIZE);

    return 0;
    +out:
    + dev_err(&chip->dev, "%s: error %d\n", __func__, rc);
    + return rc;
    }
    --
    2.19.1
    \
     
     \ /
      Last update: 2018-11-05 02:48    [W:4.030 / U:1.908 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site