From owner-svn-src-all@FreeBSD.ORG  Sat Nov  7 11:41:23 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D50B41065670;
	Sat,  7 Nov 2009 11:41:23 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C41208FC1B;
	Sat,  7 Nov 2009 11:41:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA7BfN3n046820;
	Sat, 7 Nov 2009 11:41:23 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA7BfNXX046817;
	Sat, 7 Nov 2009 11:41:23 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <200911071141.nA7BfNXX046817@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 7 Nov 2009 11:41:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199015 - in head/sys: dev/ichwd modules/ichwd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Nov 2009 11:41:23 -0000

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>