From owner-svn-src-head@freebsd.org Fri Dec 14 17:43:36 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 127D6133D20E; Fri, 14 Dec 2018 17:43:36 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AE1F288940; Fri, 14 Dec 2018 17:43:35 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A15DB2BE1; Fri, 14 Dec 2018 17:43:35 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBEHhZlF096561; Fri, 14 Dec 2018 17:43:35 GMT (envelope-from mw@FreeBSD.org) Received: (from mw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBEHhZar096560; Fri, 14 Dec 2018 17:43:35 GMT (envelope-from mw@FreeBSD.org) Message-Id: <201812141743.wBEHhZar096560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mw set sender to mw@FreeBSD.org using -f From: Marcin Wojtas Date: Fri, 14 Dec 2018 17:43:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r342085 - head/sys/dev/tpm X-SVN-Group: head X-SVN-Commit-Author: mw X-SVN-Commit-Paths: head/sys/dev/tpm X-SVN-Commit-Revision: 342085 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AE1F288940 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.71 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.86)[-0.855,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-0.88)[-0.883,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2018 17:43:36 -0000 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 */