From nobody Thu Sep 01 07:21:25 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MJCCB1RHQz4bbdf; Thu, 1 Sep 2022 07:21:26 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MJCCB10L2z3Wdr; Thu, 1 Sep 2022 07:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662016886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5UsmbQOrcG6l94L4wzILCZsHsUqsgKf/suyCmsorhuM=; b=LNxXqb966Njva1EM30d/jN6v3uowI8bMNsm+XJ6fO+/wpY0BJvgs+lwQfEp8c/JBMbgfzu A+X3ZViUl0wUFYoo9daw5JqPtyqjKxdRFrfxKQXl8ndrHZZjgctzYC7aXXH8JPr0O4rDIE 4fZmfnYk1BPeb1qT7cVY1KNfBF2jkTMBX1HbT8L9A/r3yN2gO7ceLwelzoz7XUtb1sWGZu HHWYqZ/F9K49dx2RENQyHY2ebbEITc4siWDhkOG1fCGo1nr8J7vYtu5ivCK7VTnXm2zpZg MRgXgPTWgBM3cGPAdbYTTr07X42mKhkdu5c7Gf1XAfmvQUB9isW99vRUKZVnmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MJCCB04D6zPMF; Thu, 1 Sep 2022 07:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2817LPO5071985; Thu, 1 Sep 2022 07:21:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2817LP7N071984; Thu, 1 Sep 2022 07:21:25 GMT (envelope-from git) Date: Thu, 1 Sep 2022 07:21:25 GMT Message-Id: <202209010721.2817LP7N071984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Kornel=20Dul=C4=99ba?= Subject: git: 91af12081edc - stable/13 - TPM: do not set device description if probe fails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kd X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 91af12081edcb0ce6fccce3e5a037985fe0975a2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662016886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5UsmbQOrcG6l94L4wzILCZsHsUqsgKf/suyCmsorhuM=; b=kaddyevo3QunGSQ8ju4IIIcuzyQXPOV8qT5sbseaweDi7lgw/kP3PtMJBiaK+eeGUCh5dl jRKdOd2c48zeF2r7596Q0I0sdaoxlLuYt1hYGR4cT1fhggK30b99XgwQTqvbCtu0lln1dm ssVViY0hICdpfsvWbJDeAd5jEt/ifvFYtrx3pOV0XT16XtHqbdz8V+vowREJ6oO5MeBJ3A hGh8NZWlYhYql3CM7fhvDEaN2YsAOn8cdU5z1HeKxJJMUaND/A1oorkUem5mQLEKB9UfFz RxouI6MPj15XWLZXnJzdtUpwIpm88JVtzBeHa0Hy9fYkfnL8YmD1gdKTjSDEBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662016886; a=rsa-sha256; cv=none; b=jGJKrdckkB9byC0RFBqAFpZCD+O0R+atm4vmxDw3zD/5M4Dj/vrmowGLBXkhWL57Ubazxc QbwcDMnI4h1xMP9EX9/kfhSeqkE1sougbkH6AasgJgOyegibep/p1z8mqwQRUo9G2iP0cp ltPCR2GWdBSpvGb46EZi1PFZwMnBm409mtZrqip87L5kmyCIyCnjkaroSgN7X7432e4Ryd IY1khghNdwO4/GpIUKkkP66dyFY4Uci2zXRefQJkPQyppDz5a1RBIh9XmmZfkyrf57546w NBe0F21CjEzocWi2/qWdqGafKlTNSf8oeyV3IgVo8PAqnHtnaeJ8u50bq/yCtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kd: URL: https://cgit.FreeBSD.org/src/commit/?id=91af12081edcb0ce6fccce3e5a037985fe0975a2 commit 91af12081edcb0ce6fccce3e5a037985fe0975a2 Author: Konrad Sewiłło-Jopek AuthorDate: 2022-08-16 07:27:36 +0000 Commit: Kornel Dulęba CommitDate: 2022-09-01 07:14:40 +0000 TPM: do not set device description if probe fails device_set_desc should be called only if driver probes successfully. Approved by: mw(mentor) Reviewed by: mw, kd MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D35998 (cherry picked from commit 31ee3a33aa612294db302828d4d1f6f0c83bef4c) --- sys/dev/tpm/tpm_crb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c index 5345be261d16..c471fddf61f2 100644 --- a/sys/dev/tpm/tpm_crb.c +++ b/sys/dev/tpm/tpm_crb.c @@ -114,7 +114,7 @@ tpmcrb_acpi_probe(device_t dev) status = AcpiGetTable(ACPI_SIG_TPM2, 1, (ACPI_TABLE_HEADER **) &tbl); if(ACPI_FAILURE(status) || tbl->StartMethod != TPM2_START_METHOD_CRB) - err = ENXIO; + return (ENXIO); device_set_desc(dev, "Trusted Platform Module 2.0, CRB mode"); return (err);