]> xenbits.xensource.com Git - people/andrewcoop/seabios.git/commitdiff
tpm: use get_tpm_version() callback
authorMarc-André Lureau <marcandre.lureau@redhat.com>
Mon, 26 Feb 2018 14:12:13 +0000 (09:12 -0500)
committerKevin O'Connor <kevin@koconnor.net>
Tue, 27 Feb 2018 16:29:11 +0000 (11:29 -0500)
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>
src/hw/tpm_drivers.c

index 0daaef281098c87e02735ed3a9e18ef6339d832f..5cee9d85c67ccd5ebfa7768e9b50023cd7d6306d 100644 (file)
@@ -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;