From owner-dev-commits-src-main@freebsd.org Thu Jun 24 10:05:37 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 41717640455; Thu, 24 Jun 2021 10:05:37 +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 4G9bNx1Rg1z3mDK; Thu, 24 Jun 2021 10:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1814C1610E; Thu, 24 Jun 2021 10:05:37 +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 15OA5b8k072714; Thu, 24 Jun 2021 10:05:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15OA5ahB072713; Thu, 24 Jun 2021 10:05:36 GMT (envelope-from git) Date: Thu, 24 Jun 2021 10:05:36 GMT Message-Id: <202106241005.15OA5ahB072713@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: 3eae4e106ac7 - main - Fix error value returned by ofw_bus_gen_get_node(). MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3eae4e106ac7222364fc9dc8c3d35d4ad8c5293a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2021 10:05:37 -0000 The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=3eae4e106ac7222364fc9dc8c3d35d4ad8c5293a commit 3eae4e106ac7222364fc9dc8c3d35d4ad8c5293a Author: Michal Meloun AuthorDate: 2021-06-24 09:56:20 +0000 Commit: Michal Meloun CommitDate: 2021-06-24 10:01:05 +0000 Fix error value returned by ofw_bus_gen_get_node(). By definition ofw_bus_get_node() should consistently return -1 when there is no associated OF node. MFC after: 4 weeks Discussed with: nwhitehorn Analyzed in: https://reviews.freebsd.org/D30761 --- sys/dev/ofw/ofw_bus_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ofw/ofw_bus_subr.c b/sys/dev/ofw/ofw_bus_subr.c index 12fbafe4077f..ea57d1086779 100644 --- a/sys/dev/ofw/ofw_bus_subr.c +++ b/sys/dev/ofw/ofw_bus_subr.c @@ -144,7 +144,7 @@ ofw_bus_gen_get_node(device_t bus, device_t dev) obd = OFW_BUS_GET_DEVINFO(bus, dev); if (obd == NULL) - return (0); + return ((phandle_t)-1); return (obd->obd_node); }