From nobody Wed Jan 03 22:02:48 2024 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 4T53cT1stnz56nwF; Wed, 3 Jan 2024 22:02:49 +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 4T53cT0ql6z4YZv; Wed, 3 Jan 2024 22:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704319369; 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=xGEVZQRVeRXQyQ79tNNxN7ahLEekSsIUeJU6ZpT+Gmk=; b=bYVgMtQ4FgNk4DBLb4WEdTdFdcKRZHKKJ6rWA9Z2O4BAiMpF8Zhh/259Nny1xvKyBq+qJj WsUnIDCn1P/hQPO6p7J2Iu14VrpXOGpuyj70I9QU/m2nhphFVFZSgHYfZrn2+DFPXwQaV7 3TwKmUU68MDDQlqCt38/fy3O0vmX8dxceiUlU6l6yuELbRzSKpkmOkdv6KXpSs6n9bov4h bqiTEZ0hOQbftsrKp62A8IKEqGuYgjUIFsVAvmXxHt+2hL8CL0HDyD19zeiHsLeLEx2aKN ugQ6IsanK8jF4lOJ7XorRXwU+Rp7GPdlJija3qzjae/r0P+tQmA81H2r8e4Qgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704319369; 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=xGEVZQRVeRXQyQ79tNNxN7ahLEekSsIUeJU6ZpT+Gmk=; b=PCIqjhnrtUp7v9KHTYlh8jUWv9ubLQ6jPqNLi5y+eS6/IM3wmbfrha4U4VwihFvSy5IbI8 CqWulftULj0+M+sdXkh98dZ9V+vRvvVG0355ob4PnkYTBWl7PtE6MesVbjybBoNezujo3L Z9sqq8U5UP2BLVd/0F/3/xnjT1NvVn3f1a/08LVefyXdkItG4RRBYC8XLl+XYAon4wuuLI ulx1bfLSaKTsMg32aWrwSlCD5SKgTRbvNWLDAZuT1pySch8X94rNGcz67seXC/2uLoX9n7 kQnWQtFty0Cz8JVCGD777IF/h8t/+CHqR3CrSvG5TKyCppuyYnMdbTTRMgS+RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704319369; a=rsa-sha256; cv=none; b=SoOWlGYHlm2UY07bY7kmtyNRx5J3bBFCnI5MLaOMgO6Am++Z5CjE+m1j4VduBKYhYRS+f6 4wqzi6JCYCCmZ2yGmygT1vXIniuagWtNRPD1YeO4nCHWIvMcMAcTcX0AXeclvh/eKCJPK6 D0fUhusDrdD0nqtdpPq9NaO1zk/W+HlenIcvozUOU26NLKqPDP2+V2LR51HsUDBZd9LRF2 h5ulJTR50D0Rw+6ZASxNTyfIrGnIUDEnvaNIcAnf5am+qLRIKwgDf3dD6MaGvvrbLr+KDG iysihQxMJKdOmNq5424RujfvBWr2GfDiob5OTjigJjuJyzDaYfdzc2bLJ739lg== 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 4T53cS73Kzz12Xk; Wed, 3 Jan 2024 22:02:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 403M2mOx072772; Wed, 3 Jan 2024 22:02:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403M2mbD072769; Wed, 3 Jan 2024 22:02:48 GMT (envelope-from git) Date: Wed, 3 Jan 2024 22:02:48 GMT Message-Id: <202401032202.403M2mbD072769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: efdbdfa9fdbc - stable/14 - aarch64 nexus: Fix a mismerge in nexus_activate_resource 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: efdbdfa9fdbc10f2cce6389d0b8a8814f0f10ea0 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=efdbdfa9fdbc10f2cce6389d0b8a8814f0f10ea0 commit efdbdfa9fdbc10f2cce6389d0b8a8814f0f10ea0 Author: John Baldwin AuthorDate: 2023-11-24 22:00:33 +0000 Commit: John Baldwin CommitDate: 2024-01-03 20:48:35 +0000 aarch64 nexus: Fix a mismerge in nexus_activate_resource Fixes: 658501d25930 aarch64 nexus: Use bus_generic_rman_*_resource (cherry picked from commit 5622f52c98cda7df1faef11d847e04500158e107) --- sys/arm64/arm64/nexus.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c index f97bf635446e..5b09accd2589 100644 --- a/sys/arm64/arm64/nexus.c +++ b/sys/arm64/arm64/nexus.c @@ -365,10 +365,8 @@ nexus_activate_resource_flags(device_t bus, device_t child, int type, int rid, rman_deactivate_resource(r); return (err); } - return (0); - default: - return (EINVAL); } + return (0); } static int