From owner-svn-src-all@FreeBSD.ORG  Tue Dec 21 12:49:37 2010
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 EB8A5106564A;
	Tue, 21 Dec 2010 12:49:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D7BB08FC19;
	Tue, 21 Dec 2010 12:49:37 +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 oBLCnbmP064097;
	Tue, 21 Dec 2010 12:49:37 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBLCnb4D064095;
	Tue, 21 Dec 2010 12:49:37 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201012211249.oBLCnb4D064095@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 21 Dec 2010 12:49:37 +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: r216614 - head/sys/dev/atkbdc
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: Tue, 21 Dec 2010 12:49:38 -0000

Author: jhb
Date: Tue Dec 21 12:49:37 2010
New Revision: 216614
URL: http://svn.freebsd.org/changeset/base/216614

Log:
  Only use the BIOS-supplied IRQ for the atkbdc device for a child atkbd
  device.  Specifically, do not reuse it for a child psm device.
  
  Tested by:	many

Modified:
  head/sys/dev/atkbdc/atkbdc_isa.c

Modified: head/sys/dev/atkbdc/atkbdc_isa.c
==============================================================================
--- head/sys/dev/atkbdc/atkbdc_isa.c	Tue Dec 21 10:43:51 2010	(r216613)
+++ head/sys/dev/atkbdc/atkbdc_isa.c	Tue Dec 21 12:49:37 2010	(r216614)
@@ -272,14 +272,16 @@ atkbdc_isa_add_child(device_t bus, u_int
 	 * list entry so we can use a standard bus_get_resource()
 	 * method.
 	 */
-	if (sc->irq == NULL) {
-		if (resource_int_value(name, unit, "irq", &t) != 0)
-			t = -1;
-	} else
-		t = rman_get_start(sc->irq);
-	if (t > 0)
-		resource_list_add(&ivar->resources, SYS_RES_IRQ, ivar->rid,
-				  t, t, 1);
+	if (order == KBDC_RID_KBD) {
+		if (sc->irq == NULL) {
+			if (resource_int_value(name, unit, "irq", &t) != 0)
+				t = -1;
+		} else
+			t = rman_get_start(sc->irq);
+		if (t > 0)
+			resource_list_add(&ivar->resources, SYS_RES_IRQ,
+			    ivar->rid, t, t, 1);
+	}
 
 	if (resource_disabled(name, unit))
 		device_disable(child);