diff options
Diffstat (limited to 'sys/pci')
| -rw-r--r-- | sys/pci/ohci_pci.c | 16 | ||||
| -rw-r--r-- | sys/pci/uhci_pci.c | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/sys/pci/ohci_pci.c b/sys/pci/ohci_pci.c index 591f665..7bce5f2 100644 --- a/sys/pci/ohci_pci.c +++ b/sys/pci/ohci_pci.c @@ -150,6 +150,14 @@ ohci_pci_attach(device_t self) void *ih; int intr; + /* For the moment, put in a message stating what is wrong */ + intr = pci_read_config(self, PCIR_INTLINE, 1); + if (intr == 0 || intr == 255) { + device_printf(self, "Invalid irq %d\n", intr); + device_printf(self, "Please switch on USB support and switch PNP-OS to 'No' in BIOS\n"); + return ENXIO; + } + /* XXX where does it say so in the spec? */ sc->sc_bus.usbrev = USBREV_1_0; @@ -214,14 +222,6 @@ ohci_pci_attach(device_t self) sprintf(sc->sc_vendor, "(unknown)"); } - intr = pci_read_config(self, PCIR_INTLINE, 1); - if (intr == 0 || intr == 255) { - device_printf(self, "Invalid irq %d\n", intr); - device_printf(self, "Please switch on USB support and switch PNP-OS to 'No' in BIOS\n"); - err = ENXIO; - goto bad3; - } - err = BUS_SETUP_INTR(parent, self, irq_res, INTR_TYPE_BIO, (driver_intr_t *) ohci_intr, sc, &ih); if (err) { diff --git a/sys/pci/uhci_pci.c b/sys/pci/uhci_pci.c index a5d6c9e..8859e50 100644 --- a/sys/pci/uhci_pci.c +++ b/sys/pci/uhci_pci.c @@ -168,6 +168,14 @@ uhci_pci_attach(device_t self) int intr; int err; + /* For the moment, put in a message stating what is wrong */ + intr = pci_read_config(self, PCIR_INTLINE, 1); + if (intr == 0 || intr == 255) { + device_printf(self, "Invalid irq %d\n", intr); + device_printf(self, "Please switch on USB support and switch PNP-OS to 'No' in BIOS\n"); + return ENXIO; + } + rid = PCI_UHCI_BASE_REG; io_res = bus_alloc_resource(self, SYS_RES_IOPORT, &rid, 0, ~0, 1, RF_ACTIVE); @@ -239,14 +247,6 @@ uhci_pci_attach(device_t self) break; } - intr = pci_read_config(self, PCIR_INTLINE, 1); - if (intr == 0 || intr == 255) { - device_printf(self, "Invalid irq %d\n", intr); - device_printf(self, "Please switch on USB support and switch PNP-OS to 'No' in BIOS\n"); - err = ENXIO; - goto bad3; - } - err = BUS_SETUP_INTR(parent, self, irq_res, INTR_TYPE_BIO, (driver_intr_t *) uhci_intr, sc, &ih); if (err) { |
