svn commit: r216614 - head/sys/dev/atkbdc

[John Baldwin]

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);