From 926911c8ff2037df79d8b3beea2674226563e36e Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Wed, 23 Jun 2010 05:43:21 +0000 Subject: [PATCH] Do not trust IRQ reported by ACPI. There are cases when it is wrong. --- sys/x86/isa/atrtc.c | 1 + sys/x86/isa/clock.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/x86/isa/atrtc.c b/sys/x86/isa/atrtc.c index dc0a89b3e341..a59528b211da 100644 --- a/sys/x86/isa/atrtc.c +++ b/sys/x86/isa/atrtc.c @@ -259,6 +259,7 @@ atrtc_attach(device_t dev) if (!atrtcclock_disable && (resource_int_value(device_get_name(dev), device_get_unit(dev), "clock", &i) != 0 || i != 0)) { + sc->intr_rid = -1; if (!(sc->intr_res = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->intr_rid, 8, 8, 1, RF_ACTIVE))) { device_printf(dev,"Can't map interrupt.\n"); diff --git a/sys/x86/isa/clock.c b/sys/x86/isa/clock.c index 69327d008926..80886449d9bf 100644 --- a/sys/x86/isa/clock.c +++ b/sys/x86/isa/clock.c @@ -535,6 +535,7 @@ attimer_attach(device_t dev) tc_init(&sc->tc); if (resource_int_value(device_get_name(dev), device_get_unit(dev), "clock", &i) != 0 || i != 0) { + sc->intr_rid = -1; if (!(sc->intr_res = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->intr_rid, 0, 0, 1, RF_ACTIVE))) { device_printf(dev,"Can't map interrupt.\n");