Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 082b55fe authored by Michael Kelley's avatar Michael Kelley Committed by Greg Kroah-Hartman
Browse files

tpm/tpm_crb: Fix error message in __crb_relinquish_locality() 



[ Upstream commit f5264068071964b56dc02c9dab3d11574aaca6ff ]

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

Fixes: 888d867d ("tpm: cmd_ready command can be issued only after granting locality")
Signed-off-by: default avatarMichael Kelley <mikelley@microsoft.com>
Acked-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4d3126f2

drivers/char/tpm/tpm_crb.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,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;

	}