diff options
| author | avg <avg@FreeBSD.org> | 2009-11-17 09:35:13 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2009-11-17 09:35:13 +0000 |
| commit | 08a2f851daff1943c8c94189b507524481d86fa0 (patch) | |
| tree | 1908add9cda6256ca18d9eafe35e03229c3e86f5 | |
| parent | f167c0352925b9637accd0b7b747f0849adf0e73 (diff) | |
| download | FreeBSD-src-08a2f851daff1943c8c94189b507524481d86fa0.zip FreeBSD-src-08a2f851daff1943c8c94189b507524481d86fa0.tar.gz | |
MFC r199015: ichwd: don't attach to isa pnp device(s) by accident
| -rw-r--r-- | sys/dev/ichwd/ichwd.c | 5 | ||||
| -rw-r--r-- | sys/modules/ichwd/Makefile | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c index 71662a5..a47eccd 100644 --- a/sys/dev/ichwd/ichwd.c +++ b/sys/dev/ichwd/ichwd.c @@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <sys/watchdog.h> +#include <isa/isavar.h> #include <dev/pci/pcivar.h> #include <dev/ichwd/ichwd.h> @@ -393,7 +394,9 @@ static int ichwd_probe(device_t dev) { - (void)dev; + /* Do not claim some ISA PnP device by accident. */ + if (isa_get_logicalid(dev) != 0) + return (ENXIO); return (0); } diff --git a/sys/modules/ichwd/Makefile b/sys/modules/ichwd/Makefile index 880ec82..21c1430 100644 --- a/sys/modules/ichwd/Makefile +++ b/sys/modules/ichwd/Makefile @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../dev/ichwd KMOD= ichwd -SRCS= ichwd.c device_if.h bus_if.h pci_if.h +SRCS= ichwd.c device_if.h bus_if.h pci_if.h isa_if.h .include <bsd.kmod.mk> |
