git: 4a0f4ccf6ae7 - stable/14 - powerpc mpc85xx: Fix infinite recursion in bus_adjust_resource method
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 27 Feb 2025 14:17:02 UTC
The branch stable/14 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=4a0f4ccf6ae7b0428da5015cc35eeafe01a5442d
commit 4a0f4ccf6ae7b0428da5015cc35eeafe01a5442d
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-02-16 17:40:34 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2025-02-27 13:09:21 +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_*
(cherry picked from commit 68a3ff041129208ea98a3bd5142061176ab4165e)
---
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 52e28a5fb1cb..1e17d613438a 100644
--- a/sys/powerpc/mpc85xx/lbc.c
+++ b/sys/powerpc/mpc85xx/lbc.c
@@ -774,7 +774,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);
}