Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Dec 2018 17:43:35 +0000 (UTC)
From:      Marcin Wojtas <mw@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r342085 - head/sys/dev/tpm
Message-ID:  <201812141743.wBEHhZar096560@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mw
Date: Fri Dec 14 17:43:35 2018
New Revision: 342085
URL: https://svnweb.freebsd.org/changeset/base/342085

Log:
  Fix TPM driver compilation from r342084
  
  Include recent ACPI_ID_PROBE API change.

Modified:
  head/sys/dev/tpm/tpm_crb.c
  head/sys/dev/tpm/tpm_tis.c

Modified: head/sys/dev/tpm/tpm_crb.c
==============================================================================
--- head/sys/dev/tpm/tpm_crb.c	Fri Dec 14 16:14:36 2018	(r342084)
+++ head/sys/dev/tpm/tpm_crb.c	Fri Dec 14 17:43:35 2018	(r342085)
@@ -107,7 +107,7 @@ tpmcrb_acpi_probe(device_t dev)
 	int rid = 0;
 	uint32_t caps;
 
-	if (ACPI_ID_PROBE(device_get_parent(dev), dev, tpmcrb_ids) == NULL)
+	if (ACPI_ID_PROBE(device_get_parent(dev), dev, tpmcrb_ids, NULL) == NULL)
 		return (ENXIO);
 
 	/* Check if device is in CRB mode */

Modified: head/sys/dev/tpm/tpm_tis.c
==============================================================================
--- head/sys/dev/tpm/tpm_tis.c	Fri Dec 14 16:14:36 2018	(r342084)
+++ head/sys/dev/tpm/tpm_tis.c	Fri Dec 14 17:43:35 2018	(r342085)
@@ -104,7 +104,7 @@ tpmtis_acpi_probe(device_t dev)
 	int rid = 0;
 	uint32_t caps;
 
-	if (ACPI_ID_PROBE(device_get_parent(dev), dev, tpmtis_ids) == NULL)
+	if (ACPI_ID_PROBE(device_get_parent(dev), dev, tpmtis_ids, NULL) == NULL)
 		return (ENXIO);
 
 	/* Check if device is in TPM 2.0 TIS mode */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812141743.wBEHhZar096560>