V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

tpm: Fix fault in case CONFIG_DM_TPM is set without any TPM 

In case CONFIG_DM_TPM was set without any TPM chipset configured a fault
was generated (NULL pointer access).

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
This commit is contained in:
Christophe Ricard 2016-01-21 23:19:13 +01:00 committed by Simon Glass
parent 3faf2216d9
commit 0e37d4c2c6
2 changed files with 2 additions and 2 deletions

2
cmd/tpm.c
View File

@ -448,7 +448,7 @@ static int get_tpm(struct udevice **devp)
int rc;
rc = uclass_first_device(UCLASS_TPM, devp);
if (rc) {
if (rc || !*devp) {
printf("Could not find TPM (ret=%d)\n", rc);
return CMD_RET_FAILURE;
}

2
lib/tpm.c
View File

@ -262,7 +262,7 @@ int tpm_init(void)
struct udevice *dev;
err = uclass_first_device(UCLASS_TPM, &dev);
if (err)
if (err || !dev)
return err;
return tpm_open(dev);
}