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

Commit 961be7ef authored by Peter Huewe's avatar Peter Huewe Committed by James Morris
Browse files

tpm/tpm_tis: Add missing ifdef CONFIG_ACPI for pnp_acpi_device 



This fixes a build failure if CONFIG_PNP is set but CONFIG_ACPI is not:
drivers/char/tpm/tpm_tis.c: In function ?tpm_tis_pnp_init?:
drivers/char/tpm/tpm_tis.c:912:45: error: invalid type argument of
?->? (have ?int?)
   acpi_dev_handle = pnp_acpi_device(pnp_dev)->handle;

If CONFIG_PNPACPI is not set pnp_acpi_device is defined as 0 and thus
accesing the handle is not possible.

Fixes: 0dc55365 ("tpm: fix raciness of PPI interface lookup")
Reported-by: default avatarJim Davis <jim.epost@gmail.com>
Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent 9d5a5f65

drivers/char/tpm/tpm_tis.c

+2 −0
Original line number Diff line number Diff line
@@ -908,8 +908,10 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev, 
	if (is_itpm(pnp_dev))

		itpm = true;



#ifdef CONFIG_ACPI

	if (pnp_acpi_device(pnp_dev))

		acpi_dev_handle = pnp_acpi_device(pnp_dev)->handle;

#endif



	return tpm_tis_init(&pnp_dev->dev, acpi_dev_handle, start, len, irq);

}