Author: nwhitehorn
Date: Sun Nov 17 19:50:50 2013
New Revision: 258274
URL: http://svnweb.freebsd.org/changeset/base/258274
Log:
#interrupt-cells belongs to the iparent, not the device parent.
Modified:
head/sys/powerpc/powermac/macio.c
Modified: head/sys/powerpc/powermac/macio.c
==============================================================================
--- head/sys/powerpc/powermac/macio.c Sun Nov 17 19:37:52 2013
(r258273)
+++ head/sys/powerpc/powermac/macio.c Sun Nov 17 19:50:50 2013
(r258274)
@@ -201,10 +201,6 @@ macio_add_intr(phandle_t devnode, struct
return;
}
- if (OF_searchprop(devnode, "#interrupt-cells", &icells, sizeof(icells))
- <= 0)
- icells = 1;
-
nintr = OF_getprop_alloc(devnode, "interrupts", sizeof(*intr),
(void **)&intr);
if (nintr == -1) {
@@ -221,6 +217,10 @@ macio_add_intr(phandle_t devnode, struct
<= 0)
panic("Interrupt but no interrupt parent!\n");
+ if (OF_getprop(OF_xref_phandle(iparent), "#interrupt-cells", &icells,
+ sizeof(icells)) <= 0)
+ icells = 1;
+
for (i = 0; i < nintr; i+=icells) {
u_int irq = MAP_IRQ(iparent, intr[i]);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
