summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorHon Ching \(Vicky\) Lo <honclo@linux.vnet.ibm.com>2015-10-07 20:11:52 -0400
committerPeter Huewe <peterhuewe@gmx.de>2015-10-19 01:01:22 +0200
commit2f82e98265e0a46e122ee2a035450d065dbd0f4f (patch)
treec9a6bd9b38d4dceddf0438ef2e12c2a221404823 /drivers/char
parent89adb83c5a378618ed67a1cf4c2c2061364b4d10 (diff)
downloadblackbird-op-linux-2f82e98265e0a46e122ee2a035450d065dbd0f4f.tar.gz
blackbird-op-linux-2f82e98265e0a46e122ee2a035450d065dbd0f4f.zip
vTPM: fix searching for the right vTPM node in device tree
Replace all occurrences of '/ibm,vtpm' with '/vdevice/vtpm', as only the latter is guanranteed to be available for the client OS. The '/ibm,vtpm' node should only be used by Open Firmware, which is susceptible to changes. Signed-off-by: Hon Ching(Vicky) Lo <honclo@linux.vnet.ibm.com> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/tpm/tpm_of.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
index eebe6256918f..66b3be417ccc 100644
--- a/drivers/char/tpm/tpm_of.c
+++ b/drivers/char/tpm/tpm_of.c
@@ -31,7 +31,7 @@ int read_log(struct tpm_bios_log *log)
return -EFAULT;
}
- np = of_find_node_by_name(NULL, "ibm,vtpm");
+ np = of_find_node_by_name(NULL, "vtpm");
if (!np) {
pr_err("%s: ERROR - IBMVTPM not supported\n", __func__);
return -ENODEV;
OpenPOWER on IntegriCloud