Messages in this thread Patch in this message | | | From | Christophe JAILLET <> | Subject | [PATCH] tpm_tis: Fix an error handling path in 'tpm_tis_core_init()' | Date | Sat, 6 Nov 2021 17:42:04 +0100 |
| |
Commit 79ca6f74dae0 ("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: 79ca6f74dae0 ("tpm: fix Atmel TPM crash caused by too frequent queries") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/char/tpm/tpm_tis_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index b2659a4c4016..e672d2dc8937 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -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; -- 2.30.2
| |