From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon, 26 Feb 2018 14:12:13 +0000 (-0500)
Subject: tpm: use get_tpm_version() callback
X-Git-Tag: rel-1.12.0~32
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a197e204cadd70758de3ea94cfb6d647e88ada95;p=people%2Fandrewcoop%2Fseabios.git

tpm: use get_tpm_version() callback

As originally intended.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---

diff --git a/src/hw/tpm_drivers.c b/src/hw/tpm_drivers.c
index 0daaef2..5cee9d8 100644
--- a/src/hw/tpm_drivers.c
+++ b/src/hw/tpm_drivers.c
@@ -346,6 +346,7 @@ struct tpm_driver tpm_drivers[TPM_NUM_DRIVERS] = {
             .durations     = NULL,
             .set_timeouts  = set_timeouts,
             .probe         = tis_probe,
+            .get_tpm_version = tis_get_tpm_version,
             .init          = tis_init,
             .activate      = tis_activate,
             .ready         = tis_ready,
@@ -367,7 +368,7 @@ tpmhw_probe(void)
         if (td->probe() != 0) {
             td->init();
             TPMHW_driver_to_use = i;
-            return tis_get_tpm_version();
+            return td->get_tpm_version();
         }
     }
     return TPM_VERSION_NONE;