The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5622f52c98cda7df1faef11d847e04500158e107
commit 5622f52c98cda7df1faef11d847e04500158e107 Author: John Baldwin <[email protected]> AuthorDate: 2023-11-24 22:00:33 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2023-11-24 22:00:33 +0000 aarch64 nexus: Fix a mismerge in nexus_activate_resource Fixes: 658501d25930 aarch64 nexus: Use bus_generic_rman_*_resource --- 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 32b5542f1916..2c19d4ecfc0e 100644 --- a/sys/arm64/arm64/nexus.c +++ b/sys/arm64/arm64/nexus.c @@ -367,10 +367,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
