summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/isa/isa_machdep.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/amd64/isa/isa_machdep.c')
-rw-r--r--sys/arch/amd64/isa/isa_machdep.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/amd64/isa/isa_machdep.c b/sys/arch/amd64/isa/isa_machdep.c
index 74efd9479c9..45f164d3420 100644
--- a/sys/arch/amd64/isa/isa_machdep.c
+++ b/sys/arch/amd64/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.c,v 1.9 2006/06/08 03:18:08 weingart Exp $ */
+/* $OpenBSD: isa_machdep.c,v 1.10 2006/11/25 16:59:31 niklas Exp $ */
/* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */
#define ISA_DMA_STATS
@@ -372,8 +372,11 @@ isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg, ih_what)
struct mp_intr_map *mip;
if (mp_busses != NULL) {
- for (mip = mp_busses[mp_isa_bus].mb_intrs; mip != NULL;
- mip = mip->next) {
+ if (mp_isa_bus == NULL)
+ panic("no isa bus");
+
+ for (mip = mp_isa_bus->mb_intrs; mip != NULL;
+ mip = mip->next) {
if (mip->bus_pin == pin) {
pin = APIC_IRQ_PIN(mip->ioapic_ih);
pic = &mip->ioapic->sc_pic;