Commit e96d5282 authored by Christophe Jaillet's avatar Christophe Jaillet Committed by Jarkko Sakkinen
Browse files

tpm_tis: Fix an error handling path in 'tpm_tis_core_init()' 



Commit 79ca6f74 ("tpm: fix Atmel TPM crash caused by too frequent
queries") has moved some code around without updating the error handling
path.

This is now pointless to 'goto out_err' when neither 'clk_enable()' nor
'ioremap()' have been called yet.

Make a direct return instead to avoid undoing things that have not been
done.

Fixes: 79ca6f74 ("tpm: fix Atmel TPM crash caused by too frequent queries")
Signed-off-by: default avatarChristophe Jaillet <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
parent d2704808

drivers/char/tpm/tpm_tis_core.c

+1 −1
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, 


	rc = tpm_tis_read32(priv, TPM_DID_VID(0), &vendor);

	if (rc < 0)

		goto out_err;

		return rc;



	priv->manufacturer_id = vendor;