d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the multiple interrupts attachment an error not a panic.

Browse Source 
Sometimes, when pccardd is restarted, it fails to realize that the
device is already attached and tries to attach it again.  This leads
to bad mojo since the pccard code isn't setup to handle that, so the
panic was put in.  Now it appears that it is triggering too easily, so
I'm backing it off to a non-fatal error.
This commit is contained in:
Warner Losh 2001-07-25 15:09:54 +00:00
parent 101f105db2
commit dd99c79cc1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/pccard/pcic_pci.c
View File

@ -644,8 +644,11 @@ pcic_pci_setup_intr(device_t dev, device_t child, struct resource *irq,
struct pcic_softc *sc = (struct pcic_softc *) device_get_softc(dev);
struct pcic_slot *sp = &sc->slots[0];
if (sp->intr)
panic("Interrupt already established");
if (sp->intr) {
device_printf(dev,
"Interrupt already established, possible multiple attach bug.\n");
return (EINVAL);
}
sp->intr = intr;
sp->argp = arg;
*cookiep = sc;