git: c24e5fcca9c2 - main - mvs: Fix to use rman_get_rid rather than non-existent rid argument
Date: Wed, 17 Jul 2024 13:00:10 UTC
The branch main has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=c24e5fcca9c2f2cacaf3d7883f0ecb4d5a4747cc
commit c24e5fcca9c2f2cacaf3d7883f0ecb4d5a4747cc
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2024-07-17 12:59:13 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2024-07-17 12:59:13 +0000
mvs: Fix to use rman_get_rid rather than non-existent rid argument
This got missed as it's not built in a normal tinderbox build.
This fixes building arm.armv7 ARMADAXP (marked NO_UNIVERSE).
Fixes: 9dbf5b0e6876 ("new-bus: Remove the 'rid' and 'type' arguments from BUS_RELEASE_RESOURCE")
---
sys/dev/mvs/mvs_soc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c
index 00a868140a0e..b48321b04955 100644
--- a/sys/dev/mvs/mvs_soc.c
+++ b/sys/dev/mvs/mvs_soc.c
@@ -372,7 +372,7 @@ mvs_release_resource(device_t dev, device_t child, struct resource *r)
rman_release_resource(r);
return (0);
case SYS_RES_IRQ:
- if (rid != ATA_IRQ_RID)
+ if (rman_get_rid(r) != ATA_IRQ_RID)
return ENOENT;
return (0);
}