diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-07-28 14:18:01 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-07-28 14:18:01 +0300 |
commit | e89d4ca1df630378bde3e36c42001b755b0044fe (patch) | |
tree | d953ccecb8365acab65d0075e674f7e9a9bd9880 /drivers/char/tpm/st33zp24/st33zp24.c | |
parent | 2ac5413e5edca6910d2ae157187a889e94be2b62 (diff) | |
parent | 92ed301919932f777713b9172e525674157e983d (diff) | |
download | linux-e89d4ca1df630378bde3e36c42001b755b0044fe.tar.xz |
Merge tag 'v5.8-rc7' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/char/tpm/st33zp24/st33zp24.c')
-rw-r--r-- | drivers/char/tpm/st33zp24/st33zp24.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/st33zp24/st33zp24.c b/drivers/char/tpm/st33zp24/st33zp24.c index 37bb13f516be..4ec10ab5e576 100644 --- a/drivers/char/tpm/st33zp24/st33zp24.c +++ b/drivers/char/tpm/st33zp24/st33zp24.c @@ -502,7 +502,7 @@ static const struct tpm_class_ops st33zp24_tpm = { /* * st33zp24_probe initialize the TPM device - * @param: client, the i2c_client drescription (TPM I2C description). + * @param: client, the i2c_client description (TPM I2C description). * @param: id, the i2c_device_id struct. * @return: 0 in case of success. * -1 in other case. |