Author: avg
Date: Sat Nov 7 11:41:23 2009
New Revision: 199015
URL: http://svn.freebsd.org/changeset/base/199015
Log:
ichwd: don't attach to isa pnp device(s) by accident
Reviewed by: imp, des
MFC after: 1 week
Modified:
head/sys/dev/ichwd/ichwd.c
head/sys/modules/ichwd/Makefile
Modified: head/sys/dev/ichwd/ichwd.c
==============================================================================
--- head/sys/dev/ichwd/ichwd.c Sat Nov 7 02:10:59 2009 (r199014)
+++ head/sys/dev/ichwd/ichwd.c Sat Nov 7 11:41:23 2009 (r199015)
@@ -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: head/sys/modules/ichwd/Makefile
==============================================================================
--- head/sys/modules/ichwd/Makefile Sat Nov 7 02:10:59 2009
(r199014)
+++ head/sys/modules/ichwd/Makefile Sat Nov 7 11:41:23 2009
(r199015)
@@ -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>
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
