svn commit: r199352 - in stable/8/sys: dev/ichwd modules/ichwd
Andriy Gapon
avg at FreeBSD.org
Tue Nov 17 09:35:14 UTC 2009
Author: avg
Date: Tue Nov 17 09:35:13 2009
New Revision: 199352
URL: http://svn.freebsd.org/changeset/base/199352
Log:
MFC r199015: ichwd: don't attach to isa pnp device(s) by accident
Modified:
stable/8/sys/dev/ichwd/ichwd.c
stable/8/sys/modules/ichwd/Makefile
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/netinet6/ (props changed)
Modified: stable/8/sys/dev/ichwd/ichwd.c
==============================================================================
--- stable/8/sys/dev/ichwd/ichwd.c Tue Nov 17 07:29:35 2009 (r199351)
+++ stable/8/sys/dev/ichwd/ichwd.c Tue Nov 17 09:35:13 2009 (r199352)
@@ -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);
}
Modified: stable/8/sys/modules/ichwd/Makefile
==============================================================================
--- stable/8/sys/modules/ichwd/Makefile Tue Nov 17 07:29:35 2009 (r199351)
+++ stable/8/sys/modules/ichwd/Makefile Tue Nov 17 09:35:13 2009 (r199352)
@@ -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>
More information about the svn-src-stable-8
mailing list