diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-08-19 15:25:45 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-08-19 15:25:45 +0000 |
| commit | 5576d694bb0ee0bbd245dc4ccbcad256469c1a02 (patch) | |
| tree | fa7c01c5687613ef0619259b15efa1f103e9f62b /sys/dev | |
| parent | 0292367de97dcf9a6a95720496b1f288d5552633 (diff) | |
fetch sc_intline from pci_intr_line(ih) to accomodate for
the line being possibly resolved in pci_intr_map().
found and tested by jason@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/pccbb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index faa8ab882fc..96f4e0acda5 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccbb.c,v 1.23 2001/08/19 15:11:26 miod Exp $ */ +/* $OpenBSD: pccbb.c,v 1.24 2001/08/19 15:25:44 mickey Exp $ */ /* $NetBSD: pccbb.c,v 1.42 2000/06/16 23:41:35 cgd Exp $ */ /* @@ -473,20 +473,20 @@ pccbbattach(parent, self, aux) sc->sc_function = pa->pa_function; sc->sc_sockbase = sock_base; sc->sc_busnum = busreg; - - sc->sc_intrline = pa->pa_intrline; sc->sc_intrtag = pa->pa_intrtag; sc->sc_intrpin = pa->pa_intrpin; sc->sc_pcmcia_flags = flags; /* set PCMCIA facility */ /* Map and establish the interrupt. */ - if (pci_intr_map(pc, sc->sc_intrtag, sc->sc_intrpin, - sc->sc_intrline, &ih)) { + if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, + pa->pa_intrline, &ih)) { printf(": couldn't map interrupt\n"); return; } intrstr = pci_intr_string(pc, ih); + /* must do this after intr is mapped and established */ + sc->sc_intrline = pci_intr_line(ih); /* * XXX pccbbintr should be called under the priority lower |