Date: Fri, 16 Feb 2024 17:43:45 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 68a3ff041129 - main - powerpc mpc85xx: Fix infinite recursion in bus_adjust_resource method Message-ID: <202402161743.41GHhjOs006084@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=68a3ff041129208ea98a3bd5142061176ab4165e commit 68a3ff041129208ea98a3bd5142061176ab4165e Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2024-02-16 17:40:34 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2024-02-16 17:40:34 +0000 powerpc mpc85xx: Fix infinite recursion in bus_adjust_resource method The default case needs to call bus_generic_adjust_resource to pass the request up the tree, not bus_adjust_resource which will just call this method again. Fixes: 5a7e717fb790 powerpc mpc85xx: Use bus_generic_rman_* --- sys/powerpc/mpc85xx/lbc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/powerpc/mpc85xx/lbc.c b/sys/powerpc/mpc85xx/lbc.c index 7db2d49955a3..151d77739c4a 100644 --- a/sys/powerpc/mpc85xx/lbc.c +++ b/sys/powerpc/mpc85xx/lbc.c @@ -773,7 +773,8 @@ lbc_adjust_resource(device_t dev, device_t child, int type, struct resource *r, return (bus_generic_rman_adjust_resource(dev, child, type, r, start, end)); case SYS_RES_IRQ: - return (bus_adjust_resource(dev, type, r, start, end)); + return (bus_generic_adjust_resource(dev, child, type, r, start, + end)); default: return (EINVAL); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402161743.41GHhjOs006084>