From owner-svn-src-stable@FreeBSD.ORG  Tue Nov 17 09:35:13 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F1CD61065670;
	Tue, 17 Nov 2009 09:35:13 +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 E02348FC08;
	Tue, 17 Nov 2009 09:35:13 +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 nAH9ZDWC098543;
	Tue, 17 Nov 2009 09:35:13 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAH9ZDB3098540;
	Tue, 17 Nov 2009 09:35:13 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <200911170935.nAH9ZDB3098540@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Tue, 17 Nov 2009 09:35:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199352 - in stable/8/sys: dev/ichwd modules/ichwd
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Nov 2009 09:35:14 -0000

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>