diff options
| author | ache <ache@FreeBSD.org> | 1997-06-09 00:53:48 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1997-06-09 00:53:48 +0000 |
| commit | 26556dc47f619072bd63b095b25d8a5b41d8957d (patch) | |
| tree | de9ef5a8e1481417b7e9c7cb5b44c4b909713c34 | |
| parent | c91025daa9ed23fc75d59176eacb0d27feba98ef (diff) | |
| download | FreeBSD-src-26556dc47f619072bd63b095b25d8a5b41d8957d.zip FreeBSD-src-26556dc47f619072bd63b095b25d8a5b41d8957d.tar.gz | |
While deciding to install irq with unneded "conflicts" keyword,
additionly check that intr vector is non-NULL
| -rw-r--r-- | sys/amd64/isa/isa.c | 7 | ||||
| -rw-r--r-- | sys/i386/isa/isa.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index 62185c6..daa5491 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.90 1997/06/08 16:43:37 ache Exp $ + * $Id: isa.c,v 1.91 1997/06/08 17:14:42 ache Exp $ */ /* @@ -537,8 +537,9 @@ config_isadev_c(isdp, mp, reconfig) undirect_isa_irq(rirq); /* free for ISA */ } #endif /* APIC_IO */ - if ( !isdp->id_conflicts - || !intr_registered(ffs(isdp->id_irq) - 1)) + if (!isdp->id_conflicts + || (!intr_registered(ffs(isdp->id_irq) - 1) + && isdp->id_intr != NULL)) register_intr(ffs(isdp->id_irq) - 1, isdp->id_id, isdp->id_ri_flags, diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 62185c6..daa5491 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.90 1997/06/08 16:43:37 ache Exp $ + * $Id: isa.c,v 1.91 1997/06/08 17:14:42 ache Exp $ */ /* @@ -537,8 +537,9 @@ config_isadev_c(isdp, mp, reconfig) undirect_isa_irq(rirq); /* free for ISA */ } #endif /* APIC_IO */ - if ( !isdp->id_conflicts - || !intr_registered(ffs(isdp->id_irq) - 1)) + if (!isdp->id_conflicts + || (!intr_registered(ffs(isdp->id_irq) - 1) + && isdp->id_intr != NULL)) register_intr(ffs(isdp->id_irq) - 1, isdp->id_id, isdp->id_ri_flags, |
