Date: Wed, 3 Jan 2024 22:02:48 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: efdbdfa9fdbc - stable/14 - aarch64 nexus: Fix a mismerge in nexus_activate_resource Message-ID: <202401032202.403M2mbD072769@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=efdbdfa9fdbc10f2cce6389d0b8a8814f0f10ea0 commit efdbdfa9fdbc10f2cce6389d0b8a8814f0f10ea0 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2023-11-24 22:00:33 +0000 Commit: John Baldwin <jhb@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401032202.403M2mbD072769>