tpm/tpm_crb: Fix error message in __crb_relinquish_locality()
authorMichael Kelley <mikelley@microsoft.com>
Fri, 11 Nov 2022 19:38:53 +0000 (11:38 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jan 2023 08:26:09 +0000 (09:26 +0100)
[ Upstream commit f5264068071964b56dc02c9dab3d11574aaca6ff ]

The error message in __crb_relinquish_locality() mentions requestAccess
instead of Relinquish. Fix it.

Fixes: 888d867df441 ("tpm: cmd_ready command can be issued only after granting locality")
Signed-off-by: Michael Kelley <mikelley@microsoft.com>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/char/tpm/tpm_crb.c

index f978738554d52e1aa67b03aadfce343581f4b634..ccc3eb40672a4cdec847381a1ac5d4bfc5c6930b 100644 (file)
@@ -257,7 +257,7 @@ static int __crb_relinquish_locality(struct device *dev,
        iowrite32(CRB_LOC_CTRL_RELINQUISH, &priv->regs_h->loc_ctrl);
        if (!crb_wait_for_reg_32(&priv->regs_h->loc_state, mask, value,
                                 TPM2_TIMEOUT_C)) {
-               dev_warn(dev, "TPM_LOC_STATE_x.requestAccess timed out\n");
+               dev_warn(dev, "TPM_LOC_STATE_x.Relinquish timed out\n");
                return -ETIME;
        }