diff options
| author | Peter Huewe <[email protected]> | 2015-01-21 23:42:50 +0000 |
|---|---|---|
| committer | James Morris <[email protected]> | 2015-01-22 02:37:33 +0000 |
| commit | 961be7ef6963806cb978ccd6acf6bf84b0c63346 (patch) | |
| tree | 39d3de404a55da6507fb7f0061035b26e6b96a27 /scripts/asn1_compiler.c | |
| parent | Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/k... (diff) | |
| download | kernel-961be7ef6963806cb978ccd6acf6bf84b0c63346.tar.gz kernel-961be7ef6963806cb978ccd6acf6bf84b0c63346.zip | |
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: 0dc553652102 ("tpm: fix raciness of PPI interface lookup")
Reported-by: Jim Davis <[email protected]>
Signed-off-by: Peter Huewe <[email protected]>
Signed-off-by: James Morris <[email protected]>
Diffstat (limited to 'scripts/asn1_compiler.c')
0 files changed, 0 insertions, 0 deletions